~ruther/guix-local

fdc78b72f8ba87a62c61f8acb6d7dbaf2b204fe0 — Ludovic Courtès 13 years ago 2f8a123
distro: make-bootstrap: Fix arguments to gawk.

* distro/packages/make-bootstrap.scm (%static-inputs)[gawk]: Use
  `substitute-keyword-arguments' to preserve the #:phases argument of
  GAWK.
1 files changed, 11 insertions(+), 9 deletions(-)

M distro/packages/make-bootstrap.scm
M distro/packages/make-bootstrap.scm => distro/packages/make-bootstrap.scm +11 -9
@@ 107,15 107,17 @@
                (arguments
                 (lambda (system)
                   `(#:patches (list (assoc-ref %build-inputs "patch/sh"))
                     #:phases (alist-cons-before
                               'build 'no-export-dynamic
                               (lambda* (#:key outputs #:allow-other-keys)
                                 ;; Since we use `-static', remove
                                 ;; `-export-dynamic'.
                                 (substitute* "configure"
                                   (("-export-dynamic") "")))
                               %standard-phases)
                     ,@((package-arguments gawk) system))))
                     ,@(substitute-keyword-arguments
                           ((package-arguments gawk) system)
                         ((#:phases phases)
                          `(alist-cons-before
                            'configure 'no-export-dynamic
                            (lambda _
                              ;; Since we use `-static', remove
                              ;; `-export-dynamic'.
                              (substitute* "configure"
                                (("-export-dynamic") "")))
                            ,phases))))))
                (inputs `(("patch/sh" ,(search-patch "gawk-shell.patch"))))))
        (finalize (lambda (p)
                    (static-package (package-with-explicit-inputs