diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-01-23 23:21:59 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-23 23:33:09 +0100 |
commit | 21c203a53a617962586ef645b22f80814b05fd65 (patch) | |
tree | 7536f5bcbec7e749164155e74ee8784afe02a202 /gnu/packages/gawk.scm | |
parent | 9c9da07f4c28192a05b3a88c7d5d1817ea392d79 (diff) | |
download | gnu-guix-21c203a53a617962586ef645b22f80814b05fd65.tar gnu-guix-21c203a53a617962586ef645b22f80814b05fd65.tar.gz |
packages: Mark the `arguments' field of <package> as thunked.
* guix/packages.scm (<package>): Mark `arguments' as thunked.
(package-derivation): Adjust accordingly. Parameterize
%CURRENT-SYSTEM to SYSTEM, so that arguments can refer to it.
* guix/build-system/gnu.scm (package-with-explicit-inputs): Expect
`package-arguments' to always return a list, and return a list.
(package-with-extra-configure-variable): Likewise.
(static-package): Likewise.
* gnu/packages/base.scm (patch, findutils, gcc-4.7, binutils-boot0,
gcc-boot0, glibc-final-with-bootstrap-bash, cross-gcc-wrapper,
static-bash-for-glibc, binutils-final, gcc-final): Change `arguments'
from a lambda to a list, and use (%current-system) as needed.
(nix-system->gnu-triplet, boot-triplet): Have the first argument
default to (%current-system).
* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Have `system'
default to (%current-system).
(%bootstrap-gcc): Change `arguments' to a list.
* gnu/packages/gawk.scm (gawk): Likewise.
* gnu/packages/m4.scm (m4): Likewise.
* gnu/packages/make-bootstrap.scm (%glibc-for-bootstrap): Likewise, and
expect `package-arguments' to return a list.
(%static-inputs, %gcc-static, tarball-package): Likewise.
* gnu/packages/ncurses.scm (ncurses): Likewise.
Diffstat (limited to 'gnu/packages/gawk.scm')
-rw-r--r-- | gnu/packages/gawk.scm | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 802042665a..ad87043d96 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -36,24 +36,20 @@ (base32 "0sss7rhpvizi2a88h6giv0i7w5h07s2fxkw3s6n1hqvcnhrfgbb0")))) (build-system gnu-build-system) (arguments - (case-lambda - ((system) - `(#:parallel-tests? #f ; test suite fails in parallel + `(#:parallel-tests? #f ; test suite fails in parallel - ;; Work around test failure on Cygwin. - #:tests? ,(not (string=? system "i686-cygwin")) + ;; Work around test failure on Cygwin. + #:tests? ,(not (string=? (%current-system) "i686-cygwin")) - #:phases (alist-cons-before - 'configure 'set-shell-file-name - (lambda* (#:key inputs #:allow-other-keys) - ;; Refer to the right shell. - (let ((bash (assoc-ref inputs "bash"))) - (substitute* "io.c" - (("/bin/sh") - (string-append bash "/bin/bash"))))) - %standard-phases))) - ((system cross-system) - '(#:parallel-tests? #f)))) + #:phases (alist-cons-before + 'configure 'set-shell-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Refer to the right shell. + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "io.c" + (("/bin/sh") + (string-append bash "/bin/bash"))))) + %standard-phases))) (inputs `(("libsigsegv" ,libsigsegv))) (home-page "http://www.gnu.org/software/gawk/") (synopsis "GNU implementation of the Awk programming language") |