nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: commencement: Avoid extra Perl build in the DAG. 

* gnu/packages/commencement.scm (grep-final): Move reference to
PERL-BOOT0 outside of 'package-with-explicit-inputs'.  Previously we
would actually depend on a variant of 'perl-boot0' built with
%BOOT5-INPUTS, which defeated the intent to not add an extra Perl build
in the DAG.
This commit is contained in:
Ludovic Courtès 2018-04-01 18:48:23 +02:00
parent 301a424906
commit 78ca500a75
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/commencement.scm
View File

@ -913,14 +913,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define grep-final (define grep-final
;; The final grep. Gzip holds a reference to it (via zgrep), so it must be ;; The final grep. Gzip holds a reference to it (via zgrep), so it must be
;; built before gzip. ;; built before gzip.
(package-with-bootstrap-guile (let ((grep (package-with-bootstrap-guile
(package-with-explicit-inputs (package (package-with-explicit-inputs grep %boot5-inputs
(inherit grep)
(inputs '()) ;no PCRE support
(native-inputs `(("perl" ,perl-boot0))))
%boot5-inputs
(current-source-location) (current-source-location)
#:guile guile-final))) #:guile guile-final))))
(package/inherit grep
(inputs (alist-delete "pcre" (package-inputs grep)))
(native-inputs `(("perl" ,perl-boot0))))))
(define %boot6-inputs (define %boot6-inputs
;; Now use the final Coreutils. ;; Now use the final Coreutils.