aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2016-03-24 15:33:21 +0100
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2016-03-31 15:47:32 +0200
commitab50bba9f6965c82f4209aa19e1345882548ed70 (patch)
tree7c6ea3121d4d18aeb44505bc04f7a66b4d139831
parentcb6ce89e21df4f7ddb8e87d7fb0c3c776120e3eb (diff)
downloadguix-ab50bba9f6965c82f4209aa19e1345882548ed70.tar
guix-ab50bba9f6965c82f4209aa19e1345882548ed70.tar.gz
build-system/ant: Add zip.
* guix/build-system/ant.scm (default-zip): New variable. (lower): Add zip to native inputs.
-rw-r--r--guix/build-system/ant.scm10
1 files changed, 9 insertions, 1 deletions
diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm
index d3054e5ffa..f333aa5ae8 100644
--- a/guix/build-system/ant.scm
+++ b/guix/build-system/ant.scm
@@ -54,15 +54,22 @@
(let ((jdk-mod (resolve-interface '(gnu packages java))))
(module-ref jdk-mod 'ant)))
+(define (default-zip)
+ "Return the default ZIP package."
+ ;; Lazily resolve the binding to avoid a circular dependency.
+ (let ((zip-mod (resolve-interface '(gnu packages zip))))
+ (module-ref zip-mod 'zip)))
+
(define* (lower name
#:key source inputs native-inputs outputs system target
(jdk (default-jdk))
(ant (default-ant))
+ (zip (default-zip))
#:allow-other-keys
#:rest arguments)
"Return a bag for NAME."
(define private-keywords
- '(#:source #:target #:jdk #:ant #:inputs #:native-inputs))
+ '(#:source #:target #:jdk #:ant #:zip #:inputs #:native-inputs))
(and (not target) ;XXX: no cross-compilation
(bag
@@ -77,6 +84,7 @@
,@(standard-packages)))
(build-inputs `(("jdk" ,jdk "jdk")
("ant" ,ant)
+ ("zip" ,zip)
,@native-inputs))
(outputs outputs)
(build ant-build)