diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-02-01 20:46:16 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-02-01 20:46:16 +0200 |
| commit | 13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1 (patch) | |
| tree | 6e325b0bf4729b5f7ba350428745ffd550dcf33d /pkgs/servers | |
| parent | 3cc7fa0be91ba9ac4dd9b96c551de79220b27704 (diff) | |
| download | nixlib-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar nixlib-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar.gz nixlib-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar.bz2 nixlib-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar.lz nixlib-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar.xz nixlib-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar.zst nixlib-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.zip | |
treewide: Mass replace 'openssl}/bin' to refer the 'bin' output
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/nix-binary-cache/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/shellinabox/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 857d4bb4d490..be7cadac44da 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --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" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { --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 = '' |