diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-11-04 15:16:11 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-11-04 15:36:00 +0100 |
| commit | fb77c61422ae2d03c0bf655d96b0e88f5f8001da (patch) | |
| tree | 7471194396b89ba96dd3ca7dfdd63b87c8e66db7 /gnu | |
| parent | 8af47ef603aeea6efbcfe9ab2c4adefefad2f6fb (diff) | |
| download | guix-patches-fb77c61422ae2d03c0bf655d96b0e88f5f8001da.tar guix-patches-fb77c61422ae2d03c0bf655d96b0e88f5f8001da.tar.gz | |
gnu: Remove '%final-inputs' references at the top level.
Due to circular dependencies, referring to bindings exported by other
modules from the top level is frowned upon. This patch addresses one of
the remaining cases.
* gnu/packages/base.scm (%final-inputs): New procedure.
* gnu/packages/cross-base.scm: Remove (gnu packages commencement) import.
(cross-gcc): Use the new '%final-inputs'.
* gnu/packages/make-bootstrap.scm: Remove (gnu packages commencement) import.
(package-with-relocatable-glibc): Use the new '%final-inputs'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/base.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/cross-base.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a476837102..012a807bab 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1003,4 +1003,10 @@ program. It supports a wide variety of different encodings.") (proc (module-ref iface 'canonical-package))) (proc package))) +(define-public (%final-inputs) + "Return the list of \"final inputs\"." + ;; Avoid circular dependency by lazily resolving 'commencement'. + (let ((iface (resolve-interface '(gnu packages commencement)))) + (module-ref iface '%final-inputs))) + ;;; base.scm ends here diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 3bd30fd78c..0000a3adcb 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -23,7 +23,6 @@ #:use-module (gnu packages) #:use-module (gnu packages gcc) #:use-module (gnu packages base) - #:use-module (gnu packages commencement) #:use-module (gnu packages linux) #:use-module (guix packages) #:use-module (guix download) @@ -257,11 +256,11 @@ GCC that does not target a libc; otherwise, target that libc." ;; Call it differently so that the builder can check whether the "libc" ;; input is #f. - ("libc-native" ,@(assoc-ref %final-inputs "libc")) + ("libc-native" ,@(assoc-ref (%final-inputs) "libc")) ;; Remaining inputs. ,@(let ((inputs (append (package-inputs %xgcc) - (alist-delete "libc" %final-inputs)))) + (alist-delete "libc" (%final-inputs))))) (if libc `(("libc" ,libc) ("xkernel-headers" ;the target headers diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 336ad2ee13..f2bae7753f 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -23,7 +23,6 @@ #:use-module (guix build-system trivial) #:use-module (guix build-system gnu) #:use-module ((gnu packages) #:select (search-patch)) - #:use-module ((gnu packages commencement) #:select (%final-inputs)) #:use-module (gnu packages base) #:use-module (gnu packages cross-base) #:use-module (gnu packages bash) @@ -101,14 +100,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (cross-binutils target) (cross-bootstrap-libc))) ("cross-binutils" ,(cross-binutils target)) - ,@%final-inputs)) + ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap)) ("gcc" ,(package (inherit gcc) (outputs '("out")) ; all in one so libgcc_s is easily found (inputs `(("libc",(glibc-for-bootstrap)) ,@(package-inputs gcc))))) - ,@(fold alist-delete %final-inputs '("libc" "gcc"))))) + ,@(fold alist-delete (%final-inputs) '("libc" "gcc"))))) (package-with-explicit-inputs p inputs (current-source-location) |