build-system/{gnu,trivial-build}: Fix handling of #:guile argument.
* guix/build-system/gnu.scm (gnu-build)[guile-for-build]: Check whether GUILE matches string? before checking whether it matches derivation-path?. * guix/build-system/trivial.scm (trivial-build)[guile-for-build]: Likewise.master
parent
2143cf7a50
commit
81c7948d9a
|
@ -151,14 +151,14 @@ package if GUILE is #f or omitted."
|
||||||
|
|
||||||
(define guile-for-build
|
(define guile-for-build
|
||||||
(match guile
|
(match guile
|
||||||
|
((? package?)
|
||||||
|
(package-derivation store guile system))
|
||||||
|
((and (? string?) (? derivation-path?))
|
||||||
|
guile)
|
||||||
(#f ; the default
|
(#f ; the default
|
||||||
(let* ((distro (resolve-interface '(distro packages base)))
|
(let* ((distro (resolve-interface '(distro packages base)))
|
||||||
(guile (module-ref distro 'guile-final)))
|
(guile (module-ref distro 'guile-final)))
|
||||||
(package-derivation store guile system)))
|
(package-derivation store guile system)))))
|
||||||
((? package?)
|
|
||||||
(package-derivation store guile system))
|
|
||||||
((? derivation-path?)
|
|
||||||
guile)))
|
|
||||||
|
|
||||||
(build-expression->derivation store name system
|
(build-expression->derivation store name system
|
||||||
builder
|
builder
|
||||||
|
|
|
@ -31,14 +31,14 @@
|
||||||
ignored."
|
ignored."
|
||||||
(define guile-for-build
|
(define guile-for-build
|
||||||
(match guile
|
(match guile
|
||||||
|
((? package?)
|
||||||
|
(package-derivation store guile system))
|
||||||
|
((and (? string?) (? derivation-path?))
|
||||||
|
guile)
|
||||||
(#f ; the default
|
(#f ; the default
|
||||||
(let* ((distro (resolve-interface '(distro packages base)))
|
(let* ((distro (resolve-interface '(distro packages base)))
|
||||||
(guile (module-ref distro 'guile-final)))
|
(guile (module-ref distro 'guile-final)))
|
||||||
(package-derivation store guile system)))
|
(package-derivation store guile system)))))
|
||||||
((? package?)
|
|
||||||
(package-derivation store guile system))
|
|
||||||
((? derivation-path?)
|
|
||||||
guile)))
|
|
||||||
|
|
||||||
(build-expression->derivation store name system builder inputs
|
(build-expression->derivation store name system builder inputs
|
||||||
#:outputs outputs
|
#:outputs outputs
|
||||||
|
|
Loading…
Reference in New Issue