[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/22: gexp: 'gexp->script' uses #:guile also as the guile-for-build.
From: |
guix-commits |
Subject: |
20/22: gexp: 'gexp->script' uses #:guile also as the guile-for-build. |
Date: |
Tue, 30 Mar 2021 17:00:19 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 9b8632fceca9b0b95d76a9fbf5b8274cdeef98cf
Author: Ludovic Courtès <ludo@gnu.org>
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 3e25dfc..840af8f 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.
- 12/22: packages: 'expand-input' accepts any file-like object., (continued)
- 12/22: packages: 'expand-input' accepts any file-like object., guix-commits, 2021/03/30
- 06/22: packages: Core procedures are written in monadic style., guix-commits, 2021/03/30
- 08/22: gexp: Add 'sexp->gexp'., guix-commits, 2021/03/30
- 18/22: gexp: 'imported+compiled-modules' fully honors #:guile., guix-commits, 2021/03/30
- 21/22: gnu: gnome-shell: Adjust to new #:disallowed-references convention., guix-commits, 2021/03/30
- 19/22: gexp: Add #:guile parameter to 'load-path-expression'., guix-commits, 2021/03/30
- 09/22: build-system: Use 'sexp->gexp' for plain sexps., guix-commits, 2021/03/30
- 14/22: grafts: Add 'without-grafting'., guix-commits, 2021/03/30
- 16/22: gexp: Do not add derivations to the object cache., guix-commits, 2021/03/30
- 22/22: gexp: 'compiled-modules' gets source and parameters an environment variables., guix-commits, 2021/03/30
- 20/22: gexp: 'gexp->script' uses #:guile also as the guile-for-build.,
guix-commits <=