public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging', containing closure-size #7701

Browse Source
This commit is contained in:
Vladimír Čunát
2016-04-13 09:25:28 +02:00
parent 81cedab4f1 87b49397bf
commit 39ebb01d6e
882 changed files with 8958 additions and 2482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libvirt/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch
, pkgconfig, makeWrapper
, libxml2, gnutls, devicemapper, perl, python
, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, xen
@@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap
] ++ stdenv.lib.optionals stdenv.isLinux [
libpciaccess devicemapper lvm2 utillinux udev libcap_ng
libpciaccess devicemapper lvm2 utillinux systemd.udev.lib libcap_ng
libnl numad numactl xen
] ++ stdenv.lib.optionals stdenv.isDarwin [
libiconv gmp
];
preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH
PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd.udev.bin}/bin:$PATH
substituteInPlace configure --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
'' + ''
PATH=${dnsmasq}/bin:$PATH