summary refs log tree commit diff
path: root/gnu/packages/java.scm
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2023-09-21 14:14:45 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2023-09-21 20:36:13 +0200
commitec8c5d027f87bb39ce3fd03c40a13d7b316d9dac (patch)
treebf37bc36b013a38ec1c067af8dd0f3d12debcdd1 /gnu/packages/java.scm
parentfc1b85740adefcef2056702a82b1d95ebce8fb0e (diff)
downloadguix-ec8c5d027f87bb39ce3fd03c40a13d7b316d9dac.tar.gz
gnu: Add openjdk@21.
* gnu/packages/java.scm (openjdk21): New variable.
* gnu/packages/patches/openjdk-21-fix-rpath.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r--gnu/packages/java.scm17
1 files changed, 17 insertions, 0 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a87c688749..0307b09acf 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1550,6 +1550,23 @@ blacklisted.certs.pem"
   (make-openjdk openjdk19 "20"
                 "0pk5lpwijfv9qv7vwpsq2xfklbnqdfs6xbdhc5aamrpar4xi4ykx"))
 
+(define-public openjdk21
+  (make-openjdk openjdk20 "21"
+                "06wjfwrkqykjdkis2s1nh91cy8vwincnmc699cxvyk3fc12jf3vw"
+   (source (origin
+             (inherit (package-source base))
+             (patches (search-patches "openjdk-21-fix-rpath.patch"
+                                      "openjdk-15-xcursor-no-dynamic.patch"))))
+   (arguments
+    (substitute-keyword-arguments (package-arguments base)
+      ((#:phases phases)
+       #~(modify-phases #$phases
+           (replace 'fix-java-shebangs
+             (lambda _
+               ;; 'blacklisted' was renamed back to 'blocked'.
+               (substitute* "src/java.base/share/data/blockedcertsconverter/blocked.certs.pem"
+                 (("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))))
+
 ;;; Convenience alias to point to the latest version of OpenJDK.
 (define-public openjdk openjdk19)