~ruther/guix-local

09ba396c02405eac12215fd2d5d535a70a75c158 — Ludovic Courtès 11 years ago 5c860ce
gnu: Remove dependency from gzip to the bootstrap binaries.

* gnu/packages/base.scm (grep-final): New variable.
  (%boot5-inputs): Add it.
  (%final-inputs): Use it.
1 files changed, 11 insertions(+), 1 deletions(-)

M gnu/packages/base.scm
M gnu/packages/base.scm => gnu/packages/base.scm +11 -1
@@ 1160,9 1160,19 @@ store.")
                                 ;; test files in Gettext.
                                 #:guile guile-final)))

(define grep-final
  ;; The final grep.  Gzip holds a reference to it (via zgrep), so it must be
  ;; built before gzip.
  (package-with-bootstrap-guile
   (package-with-explicit-inputs grep
                                 %boot4-inputs
                                 (current-source-location)
                                 #:guile guile-final)))

(define %boot5-inputs
  ;; Now use the final Coreutils.
  `(("coreutils" ,coreutils-final)
    ("grep" ,grep-final)
    ,@%boot4-inputs))

(define-public %final-inputs


@@ 1183,9 1193,9 @@ store.")
               ("diffutils" ,diffutils)
               ("patch" ,patch)
               ("sed" ,sed)
               ("grep" ,grep)
               ("findutils" ,findutils)
               ("gawk" ,gawk)))
      ("grep" ,grep-final)
      ("coreutils" ,coreutils-final)
      ("make" ,gnu-make-final)
      ("bash" ,bash-final)