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/servers | |
| 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/servers')
| -rw-r--r-- | pkgs/servers/http/nix-binary-cache/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/shellinabox/default.nix | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index b007c09b0560..674557d74fc2 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { --replace @coreutils@ "${coreutils}/bin" \ --replace @findutils@ "${findutils}/bin" \ --replace @nix@ "${nix}/bin" \ - --replace @xz@ "${xz}/bin" \ - --replace @bzip2@ "${bzip2}/bin" \ + --replace @xz@ "${xz.bin}/bin" \ + --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ - --replace @openssl@ "${openssl}/bin" \ + --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ --replace @iproute@ "${iproute}/sbin" \ --replace "xXxXx" "xXxXx" @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { --replace @coreutils@ "${coreutils}/bin" \ --replace @findutils@ "${findutils}/bin" \ --replace @nix@ "${nix}/bin" \ - --replace @xz@ "${xz}/bin" \ - --replace @bzip2@ "${bzip2}/bin" \ + --replace @xz@ "${xz.bin}/bin" \ + --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ - --replace @openssl@ "${openssl}/bin" \ + --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ --replace @iproute@ "${iproute}/sbin" \ --replace "xXxXx" "xXxXx" diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 6df4905af2cd..c9f4e2d253f9 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin" substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login" substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login" - substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin" + substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl.bin}/bin" ''; postInstall = '' |