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

libvirt: Fix libsystemd dependency

Browse Source
This commit is contained in:
Rickard Nilsson 2016-07-01 20:12:33 +02:00
parent 7d67a4da99
commit 8404d626ad
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,14 +25,16 @@ stdenv.mkDerivation rec {
libxslt xhtml1 perlPackages.XMLXPath curl libpcap libxslt xhtml1 perlPackages.XMLXPath curl libpcap
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ stdenv.lib.optionals stdenv.isLinux [
libpciaccess devicemapper lvm2 utillinux systemd.udev.lib libcap_ng libpciaccess devicemapper lvm2 utillinux systemd.udev.lib libcap_ng
libnl numad numactl xen zfs libnl numad numactl xen zfs systemd
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
libiconv gmp libiconv gmp
]; ];
preConfigure = stdenv.lib.optionalString stdenv.isLinux '' preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd.udev.bin}/bin:$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"' substituteInPlace configure \
--replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' \
--replace libsystemd-daemon libsystemd
'' + '' '' + ''
PATH=${dnsmasq}/bin:$PATH PATH=${dnsmasq}/bin:$PATH
patchShebangs . # fixes /usr/bin/python references patchShebangs . # fixes /usr/bin/python references
@ -53,6 +55,7 @@ stdenv.mkDerivation rec {
"--with-virtualport" "--with-virtualport"
"--with-init-script=redhat" "--with-init-script=redhat"
"--with-storage-zfs" "--with-storage-zfs"
"--with-systemd-daemon"
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
"--with-init-script=none" "--with-init-script=none"
]; ];