summaryrefslogtreecommitdiff
path: root/distro/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-01-04 17:42:59 +0100
committerLudovic Courtès <ludo@gnu.org>2013-01-04 17:42:59 +0100
commitfdc78b72f8ba87a62c61f8acb6d7dbaf2b204fe0 (patch)
tree41ba1d0b7a3f5dca3b128c6d16f86b66bdc1938b /distro/packages
parent2f8a123ed32eba2d63822327f86eadfba2c12143 (diff)
downloadpatches-fdc78b72f8ba87a62c61f8acb6d7dbaf2b204fe0.tar
patches-fdc78b72f8ba87a62c61f8acb6d7dbaf2b204fe0.tar.gz
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.
Diffstat (limited to 'distro/packages')
-rw-r--r--distro/packages/make-bootstrap.scm20
1 files changed, 11 insertions, 9 deletions
diff --git a/distro/packages/make-bootstrap.scm b/distro/packages/make-bootstrap.scm
index c0e5d8be5d..a073ca8187 100644
--- a/distro/packages/make-bootstrap.scm
+++ b/distro/packages/make-bootstrap.scm
@@ -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