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

Merge #12779: Mass replace pkg}/bin-style strings

Browse Source 
... to refer to correct outputs
This commit is contained in:
Vladimír Čunát
2016-02-03 17:25:22 +01:00
parent 824c8dfa95 e97e690244
commit 54299b60c4
30 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/nix-binary-cache/default.nix
+6 -6
View File
@@ -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"