02/04: gnu: ant: Build with GCJ.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 60eb5614d1478eae57986898272ce4ca033ceade
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Oct 12 14:21:15 2015 +0200

    gnu: ant: Build with GCJ.
    
    * gnu/packages/java.scm (ant)[native-inputs]: Replace "icedtea6" with
      "gcj".
---
 gnu/packages/java.scm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 9e632f3..e4d0afb 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