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

libvirt: fix build on darwin

Browse Source
This commit is contained in:
Vincent Laporte 2017-06-05 05:50:46 +00:00
parent e6b5a7e627
commit dd1471b4c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig ]; nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ buildInputs = [
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap parted libxslt xhtml1 perlPackages.XMLXPath curl libpcap
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
libapparmor libcap_ng numactl xen libapparmor libcap_ng numactl xen attr parted
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
libiconv gmp libiconv gmp
]; ];
@ -50,7 +50,6 @@ stdenv.mkDerivation rec {
"--with-test" "--with-test"
"--with-esx" "--with-esx"
"--with-remote" "--with-remote"
"--with-storage-disk"
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
"--with-attr" "--with-attr"
"--with-apparmor" "--with-apparmor"
@ -59,6 +58,7 @@ stdenv.mkDerivation rec {
"--with-macvtap" "--with-macvtap"
"--with-virtualport" "--with-virtualport"
"--with-init-script=systemd+redhat" "--with-init-script=systemd+redhat"
"--with-storage-disk"
"--with-storage-zfs" "--with-storage-zfs"
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
"--with-init-script=none" "--with-init-script=none"
@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
substituteInPlace $out/libexec/libvirt-guests.sh \ substituteInPlace $out/libexec/libvirt-guests.sh \
--replace "$out/bin" "${gettext}/bin" \ --replace "$out/bin" "${gettext}/bin" \
--replace "lock/subsys" "lock" --replace "lock/subsys" "lock"
rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
'' + optionalString stdenv.isLinux '' '' + optionalString stdenv.isLinux ''
rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
wrapProgram $out/sbin/libvirtd \ wrapProgram $out/sbin/libvirtd \
--prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]} --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]}
''; '';