libvirt: revert to full systemd dependency

Fixes issue with virt-manager failing to list 'USB Host Devices' and
'PCI Host Devices' with the error "Connection does not support host
device enumeration".
This commit is contained in:
Alexei Robyn 2016-07-12 16:34:46 +10:00 committed by Bjørn Forsman
parent 2ad0a84751
commit c30d4e07c5

View File

@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
gettext libtasn1 libgcrypt yajl gettext libtasn1 libgcrypt yajl
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 libcap_ng
libnl numad numactl xen zfs libnl numad numactl xen zfs
] ++ 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}/bin:$PATH
substituteInPlace configure \ substituteInPlace configure \
--replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
'' + '' '' + ''