mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-06 21:20:33 +02:00
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:
@@ -172,7 +172,7 @@ set up using CL source package conventions."
|
||||
;; Special considerations for source packages: CL inputs become
|
||||
;; propagated, and un-handled arguments are removed.
|
||||
|
||||
(define new-propagated-inputs
|
||||
(define (new-propagated-inputs)
|
||||
(if target-is-source?
|
||||
(map rewrite
|
||||
(append
|
||||
@@ -218,7 +218,7 @@ set up using CL source package conventions."
|
||||
(substitute-keyword-arguments base-arguments
|
||||
((#:phases phases) (list phases-transformer phases))))
|
||||
(inputs (new-inputs package-inputs))
|
||||
(propagated-inputs new-propagated-inputs)
|
||||
(propagated-inputs (new-propagated-inputs))
|
||||
(native-inputs (new-inputs package-native-inputs))
|
||||
(outputs (if target-is-source?
|
||||
'("out")
|
||||
|
||||
Reference in New Issue
Block a user