From 9b8632fceca9b0b95d76a9fbf5b8274cdeef98cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 24 Mar 2021 22:42:00 +0100 Subject: 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(-) (limited to 'guix/gexp.scm') diff --git a/guix/gexp.scm b/guix/gexp.scm index 3e25dfcaa1..840af8f0f1 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1885,10 +1885,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) @@ -1911,6 +1914,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. -- cgit v1.2.3