aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2024-01-11 15:47:57 +0100
committerLudovic Courtès <ludo@gnu.org>2024-08-31 10:44:22 +0200
commit724c1a120a856e0b3d3508e966a50e1117375173 (patch)
treecc06dd7a71a547cbacb7c17ee460f74f32a8a867
parent745177cea555c88d4c0c227ddca922e2eb76eedd (diff)
downloadguix-724c1a120a856e0b3d3508e966a50e1117375173.tar.gz
guix-724c1a120a856e0b3d3508e966a50e1117375173.zip
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
-rw-r--r--guix/build-system/gnu.scm19
1 files 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