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

gnu: base: Fix circular dependency between %final-outputs and <origin> inputs. 

* gnu/packages/base.scm (%final-inputs): Add
  'package-with-bootstrap-guile' to 'finalize'.
This commit is contained in:
Ludovic Courtès 2013-10-16 16:15:07 +02:00
parent f1352766fa
commit 63760b5bab
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/base.scm
View File

@ -1001,9 +1001,13 @@ store.")
'("guile" "bash")))))) '("guile" "bash"))))))
(define-public %final-inputs (define-public %final-inputs
;; Final derivations used as implicit inputs by `gnu-build-system'. ;; Final derivations used as implicit inputs by 'gnu-build-system'. We
(let ((finalize (cut package-with-explicit-inputs <> %boot4-inputs ;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are
(current-source-location)))) ;; used for origins that have patches, thereby avoiding circular
;; dependencies.
(let ((finalize (compose package-with-bootstrap-guile
(cut package-with-explicit-inputs <> %boot4-inputs
(current-source-location)))))
`(,@(map (match-lambda `(,@(map (match-lambda
((name package) ((name package)
(list name (finalize package)))) (list name (finalize package))))