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

build-system/asdf: 'package-with-build-system' accesses inputs lazily. 

Fixes a bug whereby we would, at the top-level (while evaluation
lisp.scm package definitions), attempt to access package inputs.
Because of circular dependencies, this could lead to unbound variables
as reported by Arun Isaac <arunisaac@systemreboot.net> at
<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=33801#56>.

* guix/build-system/asdf.scm (package-with-build-system)[transform]
(new-propagated-inputs): Turn into a procedure.
Adjust user accordingly.
This commit is contained in:
Ludovic Courtès 2019-01-09 15:01:40 +01:00
parent 6e54e488c6
commit 804b9b18ac
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/build-system/asdf.scm
View File

@ -172,7 +172,7 @@ set up using CL source package conventions."
;; Special considerations for source packages: CL inputs become ;; Special considerations for source packages: CL inputs become
;; propagated, and un-handled arguments are removed. ;; propagated, and un-handled arguments are removed.
(define new-propagated-inputs (define (new-propagated-inputs)
(if target-is-source? (if target-is-source?
(map rewrite (map rewrite
(append (append
@ -218,7 +218,7 @@ set up using CL source package conventions."
(substitute-keyword-arguments base-arguments (substitute-keyword-arguments base-arguments
((#:phases phases) (list phases-transformer phases)))) ((#:phases phases) (list phases-transformer phases))))
(inputs (new-inputs package-inputs)) (inputs (new-inputs package-inputs))
(propagated-inputs new-propagated-inputs) (propagated-inputs (new-propagated-inputs))
(native-inputs (new-inputs package-native-inputs)) (native-inputs (new-inputs package-native-inputs))
(outputs (if target-is-source? (outputs (if target-is-source?
'("out") '("out")