diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-26 21:53:08 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 10:05:54 -0400 |
| commit | 216a7d8197f280eccd76aac3734686278334a6a6 (patch) | |
| tree | 327863947034f4e2a04c6a1c2b859b267821aaea | |
| parent | 068dfa33dede9caf35fbb339fe7290e0d8b4c619 (diff) | |
| download | guix-216a7d8197f280eccd76aac3734686278334a6a6.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/java.scm | 43 |
1 files 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 |