amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Add and use default IcedTea.

Browse source 
* 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".
This commit is contained in:
Ricardo Wurmus 2015-12-30 14:25:09 +01:00
parent d91488908b
commit d2540f80c2
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/java.scm
View file

@ -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)