aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/java.scm
diff options
context:
space:
mode:
authorRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-12-30 14:25:09 +0100
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2016-01-06 11:38:50 +0100
commitd2540f80c223b40faefd1ab528d4e98e3995211d (patch)
treebe2b7adb79dcf939954f6b8ff2003f68549ae0fb /gnu/packages/java.scm
parentd91488908bd0a72ebfe6d843031e8001ca5ffc6b (diff)
downloadguix-d2540f80c223b40faefd1ab528d4e98e3995211d.tar
guix-d2540f80c223b40faefd1ab528d4e98e3995211d.tar.gz
gnu: Add and use default IcedTea.
* gnu/packages/java.scm (icedtea): New variable. (swt)[native-inputs]: Replace "icedtea6" with "icedtea". * gnu/packages/bioinformatics.scm (htsjdk)[native-inputs]: Likewise. (ngs-java)[inputs]: Likewise. * gnu/packages/kodi.scm (kodi)[native-inputs]: Replace "icedtea7" with "icedtea". * gnu/packages/ruby.scm (ruby-rjb)[native-inputs]: Replace "icedtea7" with "icedtea".
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r--gnu/packages/java.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 4d0750c3d5..c4ad45e86d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -81,7 +81,7 @@
'build
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((lib (string-append (assoc-ref outputs "out") "/lib")))
- (setenv "JAVA_HOME" (assoc-ref inputs "icedtea6"))
+ (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
;; Build shared libraries. Users of SWT have to set the system
;; property swt.library.path to the "lib" directory of this
@@ -115,7 +115,7 @@
(native-inputs
`(("pkg-config" ,pkg-config)
("unzip" ,unzip)
- ("icedtea6" ,icedtea6 "jdk")))
+ ("jdk" ,icedtea "jdk")))
(home-page "https://www.eclipse.org/swt/")
(synopsis "Widget toolkit for Java")
(description
@@ -740,3 +740,5 @@ build process and its dependencies, whereas Make uses Makefile format.")
"03pggsrhkzpjnj939vhr3b7mcrhfp22b7yg3hkx52kcv8dqkg3yx"))
,@(fold alist-delete (package-native-inputs icedtea6)
'("openjdk6-src")))))))
+
+(define-public icedtea icedtea7)