aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-09-26 21:46:19 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-09-27 10:05:53 -0400
commit26dd4ce571636e2e59c756d780cb2cfa7ed20d6d (patch)
tree17386f6fe9500f96947c226830b8dc05f5b35b10
parentf0280f6245698ff90ce7f33d3270af5ab0be00e6 (diff)
downloadguix-26dd4ce571636e2e59c756d780cb2cfa7ed20d6d.tar
guix-26dd4ce571636e2e59c756d780cb2cfa7ed20d6d.tar.gz
gnu: openjdk13: Define with make-openjdk.
* gnu/packages/java.scm (openjdk13): Define with make-openjdk.
-rw-r--r--gnu/packages/java.scm42
1 files changed, 1 insertions, 41 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 33db6389a1..f32ff47254 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2113,48 +2113,8 @@ blacklisted.certs.pem"
"#! java BlacklistedCertsConverter SHA-256\n"))))))))))
(define-public openjdk13
- (package
- (inherit openjdk12)
- (name "openjdk")
- (version "13.0.7")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/openjdk/jdk13u")
- (commit (string-append "jdk-" version "-ga"))))
- (file-name (git-file-name name version))
- (sha256
- (base32
+ (make-openjdk openjdk12 "13.0.7"
"0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp"))
- (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 openjdk14
(package