diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-25 09:55:00 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-25 09:55:00 +0100 |
commit | 98c7e70a3fde4821bfd45c1cfbbb81adbe8a7ea1 (patch) | |
tree | 304067b027e50fc9926fe1c38ae92c455e1c4829 /pkgs/stdenv | |
parent | 8f48a9756b462c8b2eeaf8326feab8abf751ecd8 (diff) | |
download | nixpkgs-98c7e70a3fde4821bfd45c1cfbbb81adbe8a7ea1.tar nixpkgs-98c7e70a3fde4821bfd45c1cfbbb81adbe8a7ea1.tar.gz nixpkgs-98c7e70a3fde4821bfd45c1cfbbb81adbe8a7ea1.tar.bz2 nixpkgs-98c7e70a3fde4821bfd45c1cfbbb81adbe8a7ea1.tar.lz nixpkgs-98c7e70a3fde4821bfd45c1cfbbb81adbe8a7ea1.tar.xz nixpkgs-98c7e70a3fde4821bfd45c1cfbbb81adbe8a7ea1.tar.zst nixpkgs-98c7e70a3fde4821bfd45c1cfbbb81adbe8a7ea1.zip |
linux stdenv bootstrap: avoid building grep twice
It's perfectly enough when we use the bootstrapped grep everywhere except the one put into the final stdenv and final pkgs.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 4ddf62f0aef..ac7d8f5c706 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -231,7 +231,8 @@ rec { # Construct a fourth stdenv that uses the new GCC. But coreutils is # still from the bootstrap tools. stage4 = stageFun { - inherit (stage3.pkgs) gccPlain glibc binutils gnugrep; + inherit (stage3.pkgs) gccPlain glibc binutils; + gnugrep = bootstrapTools; coreutils = bootstrapTools; name = ""; |