guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/08: gexp: computed-file: Honor %guile-for-build.


From: guix-commits
Subject: 03/08: gexp: computed-file: Honor %guile-for-build.
Date: Sun, 19 Feb 2023 21:24:55 -0500 (EST)

apteryx pushed a commit to branch master
in repository guix.

commit 68775338a510f84e63657ab09242d79e726fa457
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Feb 2 13:09:04 2023 -0500

    gexp: computed-file: Honor %guile-for-build.
    
    * guix/gexp.scm (computed-file-compiler): Honor %guile-for-build.
---
 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 @@ This is the declarative counterpart of 'text-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 @@ This is the declarative counterpart of 'gexp->derivation'."
   ;; 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)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]