[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/13: gnu: openjdk15: Define with make-openjdk.
From: |
guix-commits |
Subject: |
08/13: gnu: openjdk15: Define with make-openjdk. |
Date: |
Tue, 27 Sep 2022 10:10:58 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 216a7d8197f280eccd76aac3734686278334a6a6
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Sep 26 21:53:08 2022 -0400
gnu: openjdk15: Define with make-openjdk.
* gnu/packages/java.scm (openjdk15): Define with make-openjdk.
[source]: Clear snippet and modules fields.
[native-inputs]: Rewrite using modify-inputs.
---
gnu/packages/java.scm | 43 +++++++++++++++++--------------------------
1 file changed, 17 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 6fc5500ba2..951663ff5c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2131,32 +2131,23 @@ blacklisted.certs.pem"
(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
- 06/13: gnu: openjdk13: Define with make-openjdk., (continued)
- 06/13: gnu: openjdk13: Define with make-openjdk., guix-commits, 2022/09/27
- 10/13: gnu: openjdk17: Define with make-openjdk., guix-commits, 2022/09/27
- 09/13: gnu: openjdk16: Define with make-openjdk., guix-commits, 2022/09/27
- 03/13: gnu: opendjk11: Improve regular expressions., guix-commits, 2022/09/27
- 01/13: gnu: opendjk11: Remove trailing #t and use gexps., guix-commits, 2022/09/27
- 02/13: gnu: opendjk11: Remove input labels., guix-commits, 2022/09/27
- 04/13: gnu: opendjk11: Reduce size by removing extraneous files., guix-commits, 2022/09/27
- 07/13: gnu: openjdk14: Define with make-openjdk., guix-commits, 2022/09/27
- 05/13: gnu: openjdk12: Introduce 'make-openjdk' syntax and use it., guix-commits, 2022/09/27
- 13/13: gnu: colord: Update to 1.4.6., guix-commits, 2022/09/27
- 08/13: gnu: openjdk15: Define with make-openjdk.,
guix-commits <=