me
/
guix
Archived
1
0
Fork 0
Code

gnu: openjdk17: Define with make-openjdk. 

* gnu/packages/java.scm (openjdk17): Define with make-openjdk.
[phases]: Use gexps.
master
Maxim Cournoyer 2022-09-26 21:57:45 -04:00
parent c5fb7bb7f7
commit b2aa42435b
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/java.scm
View File

@ -2154,43 +2154,18 @@ blacklisted.certs.pem"
"1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f")) "1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f"))
(define-public openjdk17 (define-public openjdk17
(package (make-openjdk
(inherit openjdk16) openjdk16 "17.0.3"
(name "openjdk") "0slmd6ww947gxpp4yr2wmr5z975bg86qh7zqfp2radf2q77ql65b"
(version "17.0.3")
(source (origin
(inherit (package-source openjdk16))
(method git-fetch)
(uri (git-reference
(url "https://github.com/openjdk/jdk17u")
(commit (string-append "jdk-" version "-ga"))))
(file-name (git-file-name name version))
(sha256
(base32
"0slmd6ww947gxpp4yr2wmr5z975bg86qh7zqfp2radf2q77ql65b"))
(patches
(search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
(native-inputs
`(("autoconf" ,autoconf)
("openjdk16:jdk" ,openjdk16 "jdk")
("pkg-config" ,pkg-config)
("unzip" ,unzip)
("which" ,which)
("zip" ,zip)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments openjdk16) (substitute-keyword-arguments (package-arguments openjdk16)
((#:phases phases) ((#:phases phases)
#~(modify-phases #$phases #~(modify-phases #$phases
(replace 'fix-java-shebangs (replace 'fix-java-shebangs
(lambda _ (lambda _
;; This file was "fixed" by patch-source-shebangs, but it ;; 'blacklisted' was renamed back to 'blocked'.
;; requires this exact first line.
(substitute* "make/data/blockedcertsconverter/blocked.certs.pem" (substitute* "make/data/blockedcertsconverter/blocked.certs.pem"
(("^#!.*") "#! java BlockedCertsConverter SHA-256\n")))))))) (("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))))
(native-inputs
(modify-inputs (package-native-inputs openjdk16)
(replace "openjdk" openjdk16)))
(home-page "https://openjdk.java.net/projects/jdk/17")))
;; (define-public openjdk18 ;; (define-public openjdk18
;; (package ;; (package