diff options
| author | Not Zed <notzed@gmail.com> | 2020-04-28 10:33:46 +0930 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2020-05-16 11:50:45 +0200 |
| commit | c4618174ecb6375849529f1d1026585817bb139e (patch) | |
| tree | 798c3cc70f73c372f16d0779f46bba0d6a38c262 /gnu | |
| parent | c58274133676e429bfc1486e3b58762ff8659131 (diff) | |
| download | guix-c4618174ecb6375849529f1d1026585817bb139e.tar guix-c4618174ecb6375849529f1d1026585817bb139e.tar.gz | |
gnu: Add openjdk13.
* gnu/packages/java.scm (openjdk13): New variable.
Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/java.scm | 42 | ||||
| -rw-r--r-- | gnu/packages/patches/openjdk-14-builtins.patch | 11 |
2 files changed, 53 insertions, 0 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c0ec683ebe..2519b4780b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2259,6 +2259,48 @@ new Date();")) ("zip" ,zip))) (home-page "https://openjdk.java.net/projects/jdk/12"))) +(define-public openjdk13 + (package + (inherit openjdk12) + (name "openjdk") + (version "13.0") + (source (origin + (method url-fetch) + (uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2") + (file-name (string-append name "-" version ".tar.bz2")) + (sha256 + (base32 + "0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq")) + (modules '((guix build utils))) + (snippet + `(begin + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) + #t)))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cups" ,cups) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("giflib" ,giflib) + ("lcms" ,lcms) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxt" ,libxt) + ("libxtst" ,libxtst))) + (native-inputs + `(("autoconf" ,autoconf) + ("openjdk12:jdk" ,openjdk12 "jdk") + ("make@4.2" ,gnu-make-4.2) + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://openjdk.java.net/projects/jdk/13"))) + (define-public icedtea icedtea-8) diff --git a/gnu/packages/patches/openjdk-14-builtins.patch b/gnu/packages/patches/openjdk-14-builtins.patch new file mode 100644 index 0000000000..0e7e3dcaa9 --- /dev/null +++ b/gnu/packages/patches/openjdk-14-builtins.patch @@ -0,0 +1,11 @@ +--- jdk14-bc54620a3848/make/autoconf/basics.m4 2020-02-07 04:40:54.000000000 +1030 ++++ jdk14-bc54620a3848-new/make/autoconf/basics.m4 2020-04-24 10:59:33.056098506 +0930 +@@ -583,7 +583,7 @@ + BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)]) + if test "x[$]$1" = x; then + AC_MSG_NOTICE([Required tool $2 not found in PATH, checking built-in]) +- if help $2 > /dev/null 2>&1; then ++ if command -v $2 > /dev/null 2>&1; then + AC_MSG_NOTICE([Found $2 as shell built-in. Using it]) + $1="$2" + else |