[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: commencement: Avoid extra Perl build in the DAG.
From: |
Ludovic Courtès |
Subject: |
02/03: gnu: commencement: Avoid extra Perl build in the DAG. |
Date: |
Sun, 1 Apr 2018 14:51:50 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 78ca500a7559e65a2776cff49a3d0f695d3cdf92
Author: Ludovic Courtès <address@hidden>
Date: Sun Apr 1 18:48:23 2018 +0200
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.
---
gnu/packages/commencement.scm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 88297d3..057ee16 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -913,14 +913,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"address@hidden"~%"
(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 (package
- (inherit grep)
- (inputs '()) ;no PCRE support
- (native-inputs `(("perl" ,perl-boot0))))
- %boot5-inputs
- (current-source-location)
- #:guile guile-final)))
+ (let ((grep (package-with-bootstrap-guile
+ (package-with-explicit-inputs grep %boot5-inputs
+ (current-source-location)
+ #:guile guile-final))))
+ (package/inherit grep
+ (inputs (alist-delete "pcre" (package-inputs grep)))
+ (native-inputs `(("perl" ,perl-boot0))))))
(define %boot6-inputs
;; Now use the final Coreutils.