[PATCH 1/6] gnu: %static-inputs: Use 'grep' without custom phase.

[Efraim Flashner]

This reverts commit 1063d325ea76aa2b00dfcd3d436b16e412103df1 for during
creation of the bootstrap-binaries.

* gnu/packages/make-bootstrap.scm (%static-inputs): Use a custom 'grep'
without the absolute path name in fgrep/egrep.
---
 gnu/packages/make-bootstrap.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index d2a559c08..c529e03c9 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2017 Efraim Flashner <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -206,7 +207,16 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                ("patch" ,patch)
                ("coreutils" ,coreutils)
                ("sed" ,sed)
-               ("grep" ,grep)
+               ;; We don't want to retain a reference to /gnu/store in the
+               ;; bootstrap versions of egrep/fgrep, so we remove the custom
+               ;; phase added since address@hidden
+               ("grep" ,(package
+                          (inherit grep)
+                          (arguments
+                            (substitute-keyword-arguments (package-arguments 
grep)
+                              ((#:phases phases)
+                               `(delete 'fix-egrep-and-fgrep
+                                ,phases))))))
                ("gawk" ,gawk)))
       ("bash" ,static-bash))))
 
-- 
2.11.1