amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openjdk14: Define with make-openjdk.

Browse source 
* gnu/packages/java.scm (openjdk14): Define with make-openjdk.
[source]: Remove trailing #t from snippet field and improve regexp.
This commit is contained in:
Maxim Cournoyer 2022-09-26 21:51:43 -04:00
parent 26dd4ce571
commit 068dfa33de
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 12 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

58
gnu/packages/java.scm
View file

@ -2117,52 +2117,18 @@ blacklisted.certs.pem"
"0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp")) "0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp"))
(define-public openjdk14 (define-public openjdk14
(package (make-openjdk
(inherit openjdk13) openjdk13 "14.0.2"
(name "openjdk") "07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6"
(version "14.0.2") (source (origin
(source (origin (inherit (package-source base))
(method git-fetch) (snippet ;override snippet
(uri (git-reference '(begin
(url "https://github.com/openjdk/jdk14u") ;; The m4 macro uses 'help' to search for builtins, which is
(commit (string-append "jdk-" version "-ga")))) ;; not available in bash-minimal
(file-name (git-file-name name version)) (substitute* "make/autoconf/basics.m4"
(sha256 (("if help") "if command -v"))
(base32 (for-each delete-file (find-files "." "\\.(bin|exe|jar)$"))))))))
"07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6"))
(modules '((guix build utils)))
(snippet
`(begin
;; The m4 macro uses 'help' to search for builtins, which is
;; not available in bash-minimal
(substitute* "make/autoconf/basics.m4"
(("if help") "if command -v"))
(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)
("make@4.2" ,gnu-make-4.2)
("openjdk13:jdk" ,openjdk13 "jdk")
("pkg-config" ,pkg-config)
("unzip" ,unzip)
("which" ,which)
("zip" ,zip)))
(home-page "https://openjdk.java.net/projects/jdk/14")))
(define-public openjdk15 (define-public openjdk15
(package (package