From 7f6dd3be3dceb0fda15fd02c9165614b2626813e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Feb 2022 09:31:42 +0100 Subject: gexp: 'computed-file' always uses a native Guile. Fixes a regression whereby, when cross-compiling, 'computed-file' would use a cross-compiled Guile as its builder, which would fail to run. Regression introduced in af57d1bf6c46f47d82dbc234dde1e16fa8634e9d (the problem had always been there but was hidden before behind the (not guile) condition.) * guix/gexp.scm (computed-file-compiler): For 'guile', pass #:target #f. * tests/gexp.scm ("lower-object, computed-file, #:target"): New test. --- guix/gexp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/gexp.scm') diff --git a/guix/gexp.scm b/guix/gexp.scm index dfeadbd15d..d23683e2a6 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -598,7 +598,7 @@ This is the declarative counterpart of 'gexp->derivation'." (match file (($ name gexp guile options) (mlet %store-monad ((guile (lower-object (or guile (default-guile)) - system #:target target))) + system #:target #f))) (apply gexp->derivation name gexp #:guile-for-build guile #:system system #:target target options))))) -- cgit v1.2.3