diff options
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/generic/setup.sh | 8 | ||||
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 11 |
3 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index c0c19a64c3c..0af7071e218 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -278,7 +278,7 @@ in rec { inherit stdenv shell; nativeTools = false; nativeLibc = false; - inherit (pkgs) coreutils binutils; + inherit (pkgs) coreutils binutils gnugrep; inherit (pkgs.darwin) dyld; cc = pkgs.llvmPackages.clang-unwrapped; libc = pkgs.darwin.Libsystem; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 270f6cdb68f..2255bbfe669 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -480,9 +480,11 @@ _defaultUnpack() { if [ -d "$fn" ]; then stripHash "$fn" - # We can't preserve hardlinks because they may have been introduced by - # store optimization, which might break things in the build - cp -pr --reflink=auto --no-preserve=timestamps "$fn" $strippedName + + # We can't preserve hardlinks because they may have been + # introduced by store optimization, which might break things + # in the build. + cp -pr --reflink=auto "$fn" $strippedName else diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index b796faa9a3f..b1e7e6e11ec 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -64,7 +64,7 @@ rec { # the bootstrap. In all stages, we build an stdenv and the package # set that can be built with that stdenv. stageFun = - {gccPlain, glibc, binutils, coreutils, name, overrides ? (pkgs: {}), extraBuildInputs ? []}: + {gccPlain, glibc, binutils, coreutils, gnugrep, name, overrides ? (pkgs: {}), extraBuildInputs ? []}: let @@ -93,7 +93,7 @@ rec { cc = gccPlain; isGNU = true; libc = glibc; - inherit binutils coreutils; + inherit binutils coreutils gnugrep; name = name; stdenv = stage0.stdenv; }; @@ -125,6 +125,7 @@ rec { glibc = null; binutils = null; coreutils = null; + gnugrep = null; name = null; overrides = pkgs: { @@ -160,6 +161,7 @@ rec { inherit (stage0.pkgs) glibc; binutils = bootstrapTools; coreutils = bootstrapTools; + gnugrep = bootstrapTools; name = "bootstrap-gcc-wrapper"; # Rebuild binutils to use from stage2 onwards. @@ -184,6 +186,7 @@ rec { inherit (stage1.pkgs) glibc; binutils = stage1.pkgs.binutils; coreutils = bootstrapTools; + gnugrep = bootstrapTools; name = "bootstrap-gcc-wrapper"; overrides = pkgs: { @@ -200,6 +203,7 @@ rec { gccPlain = bootstrapTools; inherit (stage2.pkgs) glibc binutils; coreutils = bootstrapTools; + gnugrep = bootstrapTools; name = "bootstrap-gcc-wrapper"; overrides = pkgs: rec { @@ -227,6 +231,7 @@ rec { # still from the bootstrap tools. stage4 = stageFun { inherit (stage3.pkgs) gccPlain glibc binutils; + gnugrep = bootstrapTools; coreutils = bootstrapTools; name = ""; @@ -243,7 +248,7 @@ rec { isGNU = true; cc = stage4.stdenv.cc.cc; libc = stage4.pkgs.glibc; - inherit (stage4.pkgs) binutils coreutils; + inherit (stage4.pkgs) binutils coreutils gnugrep; name = ""; stdenv = stage4.stdenv; shell = stage4.pkgs.bash + "/bin/bash"; |