civodul pushed a commit to branch master
in repository guix.
commit 19c6ea9ca4d66e7c7c979a17ad92779ea44c5e9e
Author: Ludovic Courtès <[email protected]>
AuthorDate: Wed Mar 24 22:42:00 2021 +0100
gexp: 'gexp->script' uses #:guile also as the guile-for-build.
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'.
---
guix/gexp.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 654ac0f..afb9357 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1800,10 +1800,13 @@ imported modules in its search path. Look up EXP's
modules in MODULE-PATH."
(set-load-path
(load-path-expression (gexp-modules exp)
module-path
+ #:guile guile
#:extensions
(gexp-extensions exp)
#:system system
- #:target target)))
+ #:target target))
+ (guile-for-build
+ (lower-object guile system #:target #f)))
(gexp->derivation name
(gexp
(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
#:target target
#:module-path module-path
+ #:guile-for-build guile-for-build
;; These derivations are not worth offloading or
;; substituting.
