mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-16 03:50:45 +02:00
Code Releases 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
Download patch file Download diff file Expand all files Collapse all files

43
gnu/packages/java.scm
View file

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