amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ant-bootstrap: Bind OUTPUTS in build phase.

Browse source 
* gnu/packages/java.scm (ant-bootstrap)[arguments]: Bind OUTPUTS to remove
reference to global %OUTPUTS.
This commit is contained in:
Ricardo Wurmus 2021-12-18 17:25:28 +01:00
parent 993e26cbe1
commit 7bd34b0b19
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/java.scm
View file

@ -359,7 +359,7 @@ JNI.")
(setenv "JAVAC" (search-input-file inputs "/bin/jikes")) (setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
(setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar")))) (setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
(replace 'build (replace 'build
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Ant complains if this file doesn't exist. ;; Ant complains if this file doesn't exist.
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
(with-output-to-file "/tmp/.ant.properties" (with-output-to-file "/tmp/.ant.properties"
@ -386,7 +386,7 @@ JNI.")
(("depends=\"jars,test-jar\"") "depends=\"jars\"")) (("depends=\"jars,test-jar\"") "depends=\"jars\""))
(invoke "bash" "bootstrap.sh" (invoke "bash" "bootstrap.sh"
(string-append "-Ddist.dir=" (string-append "-Ddist.dir="
(assoc-ref %outputs "out"))))) (assoc-ref outputs "out")))))
(add-after 'build 'strip-jar-timestamps ;based on ant-build-system (add-after 'build 'strip-jar-timestamps ;based on ant-build-system
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(define (repack-archive jar) (define (repack-archive jar)