diff options
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 5e549e48287..2cc44b319ff 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -71,7 +71,7 @@ in rec { cp ${gawk}/bin/gawk $out/bin cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin - cp ${gzip}/bin/gzip $out/bin + cp ${gzip}/bin/.gzip-wrapped $out/bin/gzip cp ${bzip2_.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 00db2826a4f..3aa7f6a3df5 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -115,7 +115,7 @@ in with pkgs; rec { cp ${gawk.out}/bin/gawk $out/bin cp -d ${gawk.out}/bin/awk $out/bin cp ${tarMinimal.out}/bin/tar $out/bin - cp ${gzip.out}/bin/gzip $out/bin + cp ${gzip.out}/bin/.gzip-wrapped $out/bin/gzip cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake.out}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 4aa52ff020f..24f81d99da3 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { '' # run gzip with "-n" when $GZIP_NO_TIMESTAMPS (set by stdenv's setup.sh) is set to stop gzip from adding timestamps # to archive headers: https://github.com/NixOS/nixpkgs/issues/86348 + # if changing so that there's no longer a .gzip-wrapped then update copy in make-bootstrap-tools.nix + '' wrapProgram $out/bin/gzip \ --add-flags "\''${GZIP_NO_TIMESTAMPS:+-n}" |