nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-system/ant: Add zip. 

* guix/build-system/ant.scm (default-zip): New variable.
(lower): Add zip to native inputs.
This commit is contained in:
Ricardo Wurmus 2016-03-24 15:33:21 +01:00
parent cb6ce89e21
commit ab50bba9f6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/build-system/ant.scm
View File

@ -54,15 +54,22 @@
(let ((jdk-mod (resolve-interface '(gnu packages java)))) (let ((jdk-mod (resolve-interface '(gnu packages java))))
(module-ref jdk-mod 'ant))) (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 (define* (lower name
#:key source inputs native-inputs outputs system target #:key source inputs native-inputs outputs system target
(jdk (default-jdk)) (jdk (default-jdk))
(ant (default-ant)) (ant (default-ant))
(zip (default-zip))
#:allow-other-keys #:allow-other-keys
#:rest arguments) #:rest arguments)
"Return a bag for NAME." "Return a bag for NAME."
(define private-keywords (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 (and (not target) ;XXX: no cross-compilation
(bag (bag
@ -77,6 +84,7 @@
,@(standard-packages))) ,@(standard-packages)))
(build-inputs `(("jdk" ,jdk "jdk") (build-inputs `(("jdk" ,jdk "jdk")
("ant" ,ant) ("ant" ,ant)
("zip" ,zip)
,@native-inputs)) ,@native-inputs))
(outputs outputs) (outputs outputs)
(build ant-build) (build ant-build)