diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-09-01 15:33:06 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-09-03 11:38:43 +0200 |
| commit | 06247e465f98300ddc69a5384b103c8c1b9a866a (patch) | |
| tree | a76b719ddbcd02913965575612c91f2efb5bac89 /gnu | |
| parent | fcf857eac452449e15f63ef6cfe5096927f33c3f (diff) | |
| download | guix-patches-06247e465f98300ddc69a5384b103c8c1b9a866a.tar guix-patches-06247e465f98300ddc69a5384b103c8c1b9a866a.tar.gz | |
gnu: ant-bootstrap: Set environment variables in a separate phase.
* gnu/packages/java.scm (ant-bootstrap)[arguments]: Move 'setenv' calls
to new 'define-java-environment-variables' phase.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/java.scm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a0b749a4de..ed8c0c777d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -360,16 +360,15 @@ JNI.") (modify-phases %standard-phases (delete 'bootstrap) (delete 'configure) - (replace 'build + (add-before 'build 'define-java-environment-variables (lambda* (#:key inputs #:allow-other-keys) + ;; First, set environment variables (eases debugging on -K). (setenv "JAVA_HOME" (assoc-ref inputs "jamvm")) - (setenv "JAVACMD" - (search-input-file inputs "/bin/jamvm")) - (setenv "JAVAC" - (search-input-file inputs "/bin/jikes")) - (setenv "CLASSPATH" - (search-input-file inputs "/lib/rt.jar")) - + (setenv "JAVACMD" (search-input-file inputs "/bin/jamvm")) + (setenv "JAVAC" (search-input-file inputs "/bin/jikes")) + (setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar")))) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) ;; Ant complains if this file doesn't exist. (setenv "HOME" "/tmp") (with-output-to-file "/tmp/.ant.properties" |