diff options
| author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 17:18:51 +0100 |
|---|---|---|
| committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 17:18:51 +0100 |
| commit | 4ce9749f74ad367334fe43fdab1076b4b9436eed (patch) | |
| tree | 49a7a6906f5a3775723893db3fc0dfcdbd1288e5 /pkgs/stdenv | |
| parent | e3d5449dfc63a8448c54d66ac4133b1f56011fc4 (diff) | |
| parent | ec773a0b5548d1dca984b51aca52b5925c0a6944 (diff) | |
| download | nixlib-4ce9749f74ad367334fe43fdab1076b4b9436eed.tar nixlib-4ce9749f74ad367334fe43fdab1076b4b9436eed.tar.gz nixlib-4ce9749f74ad367334fe43fdab1076b4b9436eed.tar.bz2 nixlib-4ce9749f74ad367334fe43fdab1076b4b9436eed.tar.lz nixlib-4ce9749f74ad367334fe43fdab1076b4b9436eed.tar.xz nixlib-4ce9749f74ad367334fe43fdab1076b4b9436eed.tar.zst nixlib-4ce9749f74ad367334fe43fdab1076b4b9436eed.zip | |
Merge remote-tracking branch 'origin/staging' into staging-nativeCheckInputs
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 5e549e48287c..2cc44b319ffa 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 00db2826a4f3..3aa7f6a3df53 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 |