From 98c7e70a3fde4821bfd45c1cfbbb81adbe8a7ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 25 Jan 2016 09:55:00 +0100 Subject: [PATCH] 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. --- pkgs/stdenv/linux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 = "";