From d2540f80c223b40faefd1ab528d4e98e3995211d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Wed, 30 Dec 2015 14:25:09 +0100
Subject: 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".
---
 gnu/packages/bioinformatics.scm | 4 ++--
 gnu/packages/java.scm           | 6 ++++--
 gnu/packages/kodi.scm           | 2 +-
 gnu/packages/ruby.scm           | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index f1f7968908..6f04965fb7 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -1644,7 +1644,7 @@ (define-public htsjdk
                        '(configure install check)))))
     (native-inputs
      `(("ant" ,ant)
-       ("jdk" ,icedtea6 "jdk")))
+       ("jdk" ,icedtea "jdk")))
     (home-page "http://samtools.github.io/htsjdk/")
     (synopsis "Java API for high-throughput sequencing data (HTS) formats")
     (description
@@ -2539,7 +2539,7 @@ (define-public ngs-java
             `(modify-phases ,phases
                (replace 'enter-dir (lambda _ (chdir "ngs-java") #t)))))))
     (inputs
-     `(("jdk" ,icedtea6 "jdk")
+     `(("jdk" ,icedtea "jdk")
        ("ngs-sdk" ,ngs-sdk)))
     (synopsis "Java bindings for NGS SDK")))
 
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 @@ (define-public swt
          '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 @@ (define-public swt
     (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 @@ (define-public icedtea7
                  "03pggsrhkzpjnj939vhr3b7mcrhfp22b7yg3hkx52kcv8dqkg3yx"))
          ,@(fold alist-delete (package-native-inputs icedtea6)
                  '("openjdk6-src")))))))
+
+(define-public icedtea icedtea7)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index f0c372bc29..4a9cebde01 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -149,7 +149,7 @@ (define (run-make makefile)
        ("doxygen" ,doxygen)
        ("gawk" ,gawk)
        ("gettext" ,gnu-gettext)
-       ("icedtea7" ,icedtea7) ; needed at build-time only, mandatory
+       ("icedtea" ,icedtea) ; needed at build-time only, mandatory
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
        ("swig" ,swig)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 47ac392aa6..0dcdb33d7c 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -466,7 +466,7 @@ (define-public ruby-rjb
             (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
             #t)))))
     (native-inputs
-     `(("jdk" ,icedtea7 "jdk")))
+     `(("jdk" ,icedtea "jdk")))
     (synopsis "Ruby-to-Java bridge using the Java Native Interface")
     (description "RJB is a bridge program that connects Ruby and Java via the
 Java Native Interface.")
-- 
cgit v1.2.3