packages: Allow the `arguments' field to be a procedure.
* guix/packages.scm (package-derivation): When ARGS is a procedure, call (ARGS SYSTEM). * distro/base.scm (gawk)[arguments]: Turn into a procedure, to disable tests on Cygwin.
This commit is contained in:
parent
a1232d0cb8
commit
03671375b6
|
@ -62,9 +62,13 @@ handlers, distributed shared memory, and more.")
|
||||||
(nix-base32-string->bytevector
|
(nix-base32-string->bytevector
|
||||||
"0sss7rhpvizi2a88h6giv0i7w5h07s2fxkw3s6n1hqvcnhrfgbb0"))))
|
"0sss7rhpvizi2a88h6giv0i7w5h07s2fxkw3s6n1hqvcnhrfgbb0"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments '()
|
(arguments (case-lambda
|
||||||
;; TODO: disable tests on Cygwin
|
((system)
|
||||||
)
|
(if (string=? system "i686-cygwin")
|
||||||
|
'(#:tests? #f) ; work around test failure on Cygwin
|
||||||
|
'()))
|
||||||
|
((system cross-system)
|
||||||
|
'())))
|
||||||
(inputs `(("libsigsegv" ,libsigsegv) ; headers
|
(inputs `(("libsigsegv" ,libsigsegv) ; headers
|
||||||
("libsigsegv/lib" ,libsigsegv "lib"))) ; library
|
("libsigsegv/lib" ,libsigsegv "lib"))) ; library
|
||||||
(home-page "http://www.gnu.org/software/gawk/")
|
(home-page "http://www.gnu.org/software/gawk/")
|
||||||
|
|
|
@ -171,7 +171,9 @@ etc."
|
||||||
(package-source-derivation store source)
|
(package-source-derivation store source)
|
||||||
inputs
|
inputs
|
||||||
#:outputs outputs #:system system
|
#:outputs outputs #:system system
|
||||||
args)))))
|
(if (procedure? args)
|
||||||
|
(args system)
|
||||||
|
args))))))
|
||||||
|
|
||||||
(define* (package-cross-derivation store package)
|
(define* (package-cross-derivation store package)
|
||||||
;; TODO
|
;; TODO
|
||||||
|
|
Loading…
Reference in New Issue