diff options
| author | ajs124 <git@ajs124.de> | 2018-06-26 12:17:04 +0200 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2018-06-27 16:21:24 +0200 |
| commit | 3f9d9686377464fe0637c693a0c801b5df75ec34 (patch) | |
| tree | 344871fbabebe4f78eda5a31e82a07c7097848ba /pkgs/development/libraries | |
| parent | b8ffd2459d63a2acfd6a7918cb93f632f0af8455 (diff) | |
| download | nixlib-3f9d9686377464fe0637c693a0c801b5df75ec34.tar nixlib-3f9d9686377464fe0637c693a0c801b5df75ec34.tar.gz nixlib-3f9d9686377464fe0637c693a0c801b5df75ec34.tar.bz2 nixlib-3f9d9686377464fe0637c693a0c801b5df75ec34.tar.lz nixlib-3f9d9686377464fe0637c693a0c801b5df75ec34.tar.xz nixlib-3f9d9686377464fe0637c693a0c801b5df75ec34.tar.zst nixlib-3f9d9686377464fe0637c693a0c801b5df75ec34.zip | |
libvirt: fix iscsi storage support
Turns out, I was testing #42545 in a nix-shell and forgot how it handles dependencies different from environments.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 49c1b054b77a..f2be3b7831a3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -93,7 +93,10 @@ in stdenv.mkDerivation rec { "sysconfdir=$(out)/var/lib" ]; - postInstall = '' + + postInstall = let + binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; + in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ --replace "$out/bin" '${gettext}/bin' \ @@ -106,7 +109,7 @@ in stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ]} + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} ''; enableParallelBuilding = true; |