mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output
This commit is contained in:
parent
9782c593ed
commit
5f4a8de754
@ -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
|
||||
'';
|
||||
|
@ -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
|
||||
'';
|
||||
|
||||
|
@ -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" \
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user