02/10: gexp: computed-file: Do not honor %guile-for-build.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit a516a0ba934c78a9ed317846362dbab8d0d788a8
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Feb 27 14:39:22 2023 +0100

    gexp: computed-file: Do not honor %guile-for-build.
    
    This reverts commit 68775338a510f84e63657ab09242d79e726fa457.
    Fixes <https://issues.guix.gnu.org/61841>.
    
    (%guile-for-build) is a derivation for a specific system,
    whereas (default-guile) is a system-independent package.  It's crucial
    to preserve this distinction.
    
    See discussion at <https://issues.guix.gnu.org/61255#29>.
    
    * guix/gexp.scm (computed-file-compiler): Honor (default-guile),
    not (%guile-for-build).
---
 guix/gexp.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/guix/gexp.scm b/guix/gexp.scm
index cabf163076..5f92174a2c 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -584,8 +584,7 @@ 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
@@ -601,8 +600,7 @@ 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 (%guile-for-build)
-                                                  (default-guile))
+     (mlet %store-monad ((guile (lower-object (or guile (default-guile))
                                               system #:target #f)))
        (apply gexp->derivation name gexp #:guile-for-build guile
               #:system system #:target target options)))))