diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 17:25:22 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 17:25:22 +0100 |
| commit | 54299b60c4a3b2ae3bfb0817b7443aec10a2def2 (patch) | |
| tree | 7c076b38cd6eac430d8dbff1ecf088727f2a74f3 /pkgs/applications/virtualization | |
| parent | 824c8dfa9573d1913fd3f21b586f0188de042c91 (diff) | |
| parent | e97e6902440b17cc1c9b05d41fd38f7c0b291139 (diff) | |
| download | nixlib-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar nixlib-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar.gz nixlib-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar.bz2 nixlib-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar.lz nixlib-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar.xz nixlib-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar.zst nixlib-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.zip | |
Merge #12779: Mass replace `pkg}/bin`-style strings
... to refer to correct outputs
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/openstack/keystone.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 2af39cd33deb..54c9ed7b1ab2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}" + --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index 3060dcb04cb3..ff60dc364051 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonPackage rec { ldap ldappool webtest requests2 oslotest pep8 pymongo which ]; - makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"]; + makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"]; postInstall = '' # install .ini files |