aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/java.scm
diff options
context:
space:
mode:
authorRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-10-12 14:21:15 +0200
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-10-13 13:45:51 +0200
commit60eb5614d1478eae57986898272ce4ca033ceade (patch)
treec3d84fcfc6f4bb483ed981625e44ebd017f12a64 /gnu/packages/java.scm
parent397dbde8fff77c31c94928d65f3c2cac85222588 (diff)
downloadguix-60eb5614d1478eae57986898272ce4ca033ceade.tar
guix-60eb5614d1478eae57986898272ce4ca033ceade.tar.gz
gnu: ant: Build with GCJ.
* gnu/packages/java.scm (ant)[native-inputs]: Replace "icedtea6" with "gcj".
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r--gnu/packages/java.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 9e632f3fbf..e4d0afb398 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -159,8 +159,8 @@ is implemented.")
(alist-replace
'build
(lambda _
- (setenv "JAVA_HOME"
- (assoc-ref %build-inputs "icedtea6"))
+ (setenv "JAVA_HOME" (string-append (assoc-ref %build-inputs "gcj")
+ "/lib/jvm"))
;; Disable tests to avoid dependency on hamcrest-core, which needs
;; Ant to build. This is necessary in addition to disabling the
;; "check" phase, because the dependency on "test-jar" would always
@@ -174,7 +174,7 @@ is implemented.")
'configure
(alist-delete 'install %standard-phases))))))
(native-inputs
- `(("icedtea6" ,icedtea6 "jdk")))
+ `(("gcj" ,gcj)))
(home-page "http://ant.apache.org")
(synopsis "Build tool for Java")
(description