me/guix
Archived
1
0
Fork 0
Code Activity

gexp: 'gexp->script' uses #:guile also as the guile-for-build.

Browse source 
Previously 'gexp->script' would unconditionally use the
default #:guile-for-build value of 'gexp->derivation'.

* guix/gexp.scm (gexp->script): Pass #:guile to 'load-path-expression'.
Pass #:guile-for-build to 'gexp->derivation'.
This commit is contained in:
Ludovic Courtès 2021-03-24 22:42:00 +01:00
parent 58210fbea2
commit 19c6ea9ca4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
guix/gexp.scm
View file

@ -1800,10 +1800,13 @@ imported modules in its search path. Look up EXP's modules in MODULE-PATH."
(set-load-path (set-load-path
(load-path-expression (gexp-modules exp) (load-path-expression (gexp-modules exp)
module-path module-path
#:guile guile
#:extensions #:extensions
(gexp-extensions exp) (gexp-extensions exp)
#:system system #:system system
#:target target))) #:target target))
(guile-for-build
(lower-object guile system #:target #f)))
(gexp->derivation name (gexp->derivation name
(gexp (gexp
(call-with-output-file (ungexp output) (call-with-output-file (ungexp output)
@ -1826,6 +1829,7 @@ imported modules in its search path. Look up EXP's modules in MODULE-PATH."
#:system system #:system system
#:target target #:target target
#:module-path module-path #:module-path module-path
#:guile-for-build guile-for-build
;; These derivations are not worth offloading or ;; These derivations are not worth offloading or
;; substituting. ;; substituting.