~ruther/guix-local

724c1a120a856e0b3d3508e966a50e1117375173 — Ludovic Courtès 2 years ago 745177c
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
1 files changed, 10 insertions(+), 9 deletions(-)

M guix/build-system/gnu.scm
M guix/build-system/gnu.scm => guix/build-system/gnu.scm +10 -9
@@ 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