diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-01-11 16:01:49 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-11 16:01:49 +0100 |
commit | 01e354eb83299d00ddd6ba4beb73bac8130beeae (patch) | |
tree | 03368edd8462d818334bec458cd04dc1de4750a1 /distro/packages/gawk.scm | |
parent | bfe384cc4c7e56ac1eceff8b5d92e916507436eb (diff) | |
parent | 28e55604212c01884a77a4f5eb66294c4957c48a (diff) | |
download | guix-patches-01e354eb83299d00ddd6ba4beb73bac8130beeae.tar guix-patches-01e354eb83299d00ddd6ba4beb73bac8130beeae.tar.gz |
Merge branch 'core-updates'
Conflicts:
guix/build/union.scm
Diffstat (limited to 'distro/packages/gawk.scm')
-rw-r--r-- | distro/packages/gawk.scm | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/distro/packages/gawk.scm b/distro/packages/gawk.scm index 3bc4a8d8f1..6fed7f8b70 100644 --- a/distro/packages/gawk.scm +++ b/distro/packages/gawk.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,15 +35,26 @@ (sha256 (base32 "0sss7rhpvizi2a88h6giv0i7w5h07s2fxkw3s6n1hqvcnhrfgbb0")))) (build-system gnu-build-system) - (arguments (case-lambda - ((system) - (if (string=? system "i686-cygwin") - '(#:tests? #f) ; work around test failure on Cygwin - '(#:parallel-tests? #f))) ; test suite fails in parallel - ((system cross-system) - '(#:parallel-tests? #f)))) - (inputs `(("libsigsegv" ,libsigsegv) ; headers - ("libsigsegv/lib" ,libsigsegv "lib"))) ; library + (arguments + (case-lambda + ((system) + `(#:parallel-tests? #f ; test suite fails in parallel + + ;; Work around test failure on Cygwin. + #:tests? ,(not (string=? 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)))) + (inputs `(("libsigsegv" ,libsigsegv))) (home-page "http://www.gnu.org/software/gawk/") (synopsis "GNU implementation of the Awk programming language") (description |