01/03: build-system/gnu: ‘package-with-extra-configure-variable’ uses gexps.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit 844fef43fd41a769f68aa1059ce41739ef53a0c4
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Jan 11 15:47:57 2024 +0100

    build-system/gnu: ‘package-with-extra-configure-variable’ uses gexps.
    
    This is required in cases where P uses gexps.
    
    * guix/build-system/gnu.scm (package-with-extra-configure-variable): Use
    gexps.
    
    Change-Id: If5cbabc946cfcaf39c040a79f9495760639d44e2
---
 guix/build-system/gnu.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index fd97c73be4..3a314d34b7 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -189,21 +189,22 @@ flags for VARIABLE, the associated value is augmented."
             (input input))
            inputs))
 
-    (package (inherit p)
+    (package
+      (inherit p)
       (arguments
        (let ((args (package-arguments p)))
          (substitute-keyword-arguments args
            ((#:configure-flags flags)
             (let* ((var= (string-append variable "="))
                    (len  (string-length var=)))
-              `(cons ,(string-append var= value)
-                     (map (lambda (flag)
-                            (if (string-prefix? ,var= flag)
-                                (string-append
-                                 ,(string-append var= value " ")
-                                 (substring flag ,len))
-                                flag))
-                          ,flags)))))))
+              #~(cons #$(string-append var= value)
+                      (map (lambda (flag)
+                             (if (string-prefix? #$var= flag)
+                                 (string-append
+                                  #$(string-append var= value " ")
+                                  (substring flag #$len))
+                                 flag))
+                           #$flags)))))))
       (replacement
        (let ((replacement (package-replacement p)))
          (and replacement