From fdc78b72f8ba87a62c61f8acb6d7dbaf2b204fe0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 4 Jan 2013 17:42:59 +0100 Subject: 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. --- distro/packages/make-bootstrap.scm | 20 +++++++++++--------- 1 file 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 -- cgit v1.2.3