TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: openjdk15: Define with make-openjdk.

Browse source 
* gnu/packages/java.scm (openjdk15): Define with make-openjdk.
[source]: Clear snippet and modules fields.
[native-inputs]: Rewrite using modify-inputs.
This commit is contained in:
Maxim Cournoyer 2022-09-26 21:53:08 -04:00
parent 068dfa33de
commit 216a7d8197
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gnu/packages/java.scm
View file

@ -2131,32 +2131,23 @@ (define-public openjdk14
(for-each delete-file (find-files "." "\\.(bin|exe|jar)$"))))))))
(define-public openjdk15
(package
(inherit openjdk14)
(name "openjdk")
(version "15.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openjdk/jdk15u")
(commit (string-append "jdk-" version "-ga"))))
(file-name (git-file-name name version))
(sha256
(base32
"168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i"))
(patches
(search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
(inputs
(cons `("libxcursor" ,libxcursor) ; for our patch to work
(package-inputs openjdk14)))
(native-inputs
`(("autoconf" ,autoconf)
("openjdk14:jdk" ,openjdk14 "jdk")
("pkg-config" ,pkg-config)
("unzip" ,unzip)
("which" ,which)
("zip" ,zip)))
(home-page "https://openjdk.java.net/projects/jdk/15")))
(make-openjdk
openjdk14 "15.0.3"
"168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i"
(source (origin
(inherit (package-source base))
(modules '())
(snippet #f)
(patches
(search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
(inputs
(modify-inputs (package-inputs base)
(append libxcursor))) ;for our patch to work
(native-inputs
(modify-inputs (package-native-inputs base)
(delete "make" ;remove old gnu-make-4.2
"openjdk") ;to remove non-jdk output
(append `(,openjdk14 "jdk"))))))
(define-public openjdk16
(package