[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#61255] [PATCH v2 3/8] gexp: computed-file: Honor %guile-for-build.
From: |
Maxim Cournoyer |
Subject: |
[bug#61255] [PATCH v2 3/8] gexp: computed-file: Honor %guile-for-build. |
Date: |
Fri, 17 Feb 2023 02:49:32 +0100 |
* guix/gexp.scm (computed-file-compiler): Honor %guile-for-build.
---
(no changes since v1)
guix/gexp.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 5f92174a2c..cabf163076 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -584,7 +584,8 @@ (define-record-type <computed-file>
(options computed-file-options)) ;list of arguments
(define* (computed-file name gexp
- #:key guile (local-build? #t) (options '()))
+ #:key guile
+ (local-build? #t) (options '()))
"Return an object representing the store item NAME, a file or directory
computed by GEXP. When LOCAL-BUILD? is #t (the default), it ensures the
corresponding derivation is built locally. OPTIONS may be used to pass
@@ -600,7 +601,8 @@ (define-gexp-compiler (computed-file-compiler (file
<computed-file>)
;; gexp.
(match file
(($ <computed-file> name gexp guile options)
- (mlet %store-monad ((guile (lower-object (or guile (default-guile))
+ (mlet %store-monad ((guile (lower-object (or guile (%guile-for-build)
+ (default-guile))
system #:target #f)))
(apply gexp->derivation name gexp #:guile-for-build guile
#:system system #:target target options)))))
--
2.39.1
- [bug#61255] bug#61841: ‘guix shell’ computes different package derivation than ‘guix build’, (continued)
[bug#61255] [PATCH 5/5] pack: Add RPM format., Maxim Cournoyer, 2023/02/03
[bug#61255] [PATCH 0/5] Add support for the RPM format to "guix pack", Ludovic Courtès, 2023/02/12
[bug#61255] [PATCH v2 0/8] Add support for the RPM format to "guix pack", Maxim Cournoyer, 2023/02/16
- [bug#61255] [PATCH v2 1/8] .dir-locals: Add let-keywords indentation rules., Maxim Cournoyer, 2023/02/16
- [bug#61255] [PATCH v2 2/8] pack: Use let-keywords instead of keyword-ref., Maxim Cournoyer, 2023/02/16
- [bug#61255] [PATCH v2 3/8] gexp: computed-file: Honor %guile-for-build.,
Maxim Cournoyer <=
- [bug#61255] [PATCH v2 6/8] pack: Add RPM format., Maxim Cournoyer, 2023/02/16
- [bug#61255] [PATCH v2 5/8] tests: pack: Fix indentation., Maxim Cournoyer, 2023/02/16
- [bug#61255] [PATCH v2 7/8] etc: Add a news entry snippet., Maxim Cournoyer, 2023/02/16
- [bug#61255] [PATCH v2 4/8] pack: Extract populate-profile-root from self-contained-tarball/builder., Maxim Cournoyer, 2023/02/16
- [bug#61255] [PATCH v2 8/8] news: Add entry for the new 'rpm' guix pack format., Maxim Cournoyer, 2023/02/16
- [bug#61255] [PATCH v2 8/8] news: Add entry for the new 'rpm' guix pack format., pelzflorian (Florian Pelz), 2023/02/17