From 724c1a120a856e0b3d3508e966a50e1117375173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 11 Jan 2024 15:47:57 +0100 Subject: [PATCH] =?UTF-8?q?build-system/gnu:=20=E2=80=98package-with-extra?= =?UTF-8?q?-configure-variable=E2=80=99=20uses=20gexps.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 fd97c73be498c30f7aaa2d9a0ed2ff66f32487d5..3a314d34b72c81762c145b4f5f29553c85c59ca3 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