From fb77c61422ae2d03c0bf655d96b0e88f5f8001da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 4 Nov 2016 15:16:11 +0100 Subject: 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'. --- gnu/packages/base.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/base.scm') 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 -- cgit v1.2.3