diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-02-01 20:45:57 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-02-01 20:45:57 +0200 |
| commit | 5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70 (patch) | |
| tree | e145aa0b03f794b3da0a717861a6581a2861437a /pkgs | |
| parent | 9782c593edcfd4f7f41689f4ecb2390dbf1bc003 (diff) | |
| download | nixpkgs-5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70.tar nixpkgs-5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70.tar.gz nixpkgs-5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70.tar.bz2 nixpkgs-5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70.tar.lz nixpkgs-5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70.tar.xz nixpkgs-5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70.tar.zst nixpkgs-5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70.zip | |
treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output
Diffstat (limited to 'pkgs')
6 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 6cde64b3090..ec92470468e 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ - -e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \ + -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ -e 's|"xz"|"${xz}/bin/xz"|' \ -i ui-snapshot.c ''; diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 6544210b206..16431c465c1 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' export PATH_CP=$(type -tp cp) export PATH_CHKCONFIG=/no-such-program - export BZIP=${bzip2}/bin/bzip2 + export BZIP=${bzip2.bin}/bin/bzip2 export SYSTEMCTL=systemctl ''; diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index b007c09b056..857d4bb4d49 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { --replace @findutils@ "${findutils}/bin" \ --replace @nix@ "${nix}/bin" \ --replace @xz@ "${xz}/bin" \ - --replace @bzip2@ "${bzip2}/bin" \ + --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ --replace @openssl@ "${openssl}/bin" \ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace @findutils@ "${findutils}/bin" \ --replace @nix@ "${nix}/bin" \ --replace @xz@ "${xz}/bin" \ - --replace @bzip2@ "${bzip2}/bin" \ + --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ --replace @openssl@ "${openssl}/bin" \ diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 6b562eef53c..dd35e03478a 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -166,7 +166,7 @@ rec { cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin cp ${gzip}/bin/gzip $out/bin - cp ${bzip2}/bin/bzip2 $out/bin + cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index d33d8f9fb66..5732437970d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -79,7 +79,7 @@ rec { cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin cp ${gzip}/bin/gzip $out/bin - cp ${bzip2}/bin/bzip2 $out/bin + cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index 93a7f9e1e39..9329cd23e83 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for p in $out/bin/* do wrapProgram "$p" \ --prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \ - --prefix PATH ":" "${which}/bin:${bzip2}/bin" + --prefix PATH ":" "${which}/bin:${bzip2.bin}/bin" done patchShebangs $out |