From 51a5310ede0099ba0d12d464c1e1268149b8a896 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Thu, 1 May 2025 09:37:40 +0900
Subject: gnu: Add openjdk22.

* gnu/packages/java.scm (openjdk22): New variable.

Change-Id: I980d6863f626f072dd635ea97c2475cd53c7b403
---
 gnu/packages/java.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/java.scm')

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index f4d83da05a6..6d62da58002 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2019, 2020, 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
-;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2022, 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 Mike Gerwitz <mtg@gnu.org>
 ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
@@ -1793,6 +1793,20 @@ blacklisted.certs.pem"
                (substitute* "src/java.base/share/data/blockedcertsconverter/blocked.certs.pem"
                  (("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))))
 
+(define-public openjdk22
+  (make-openjdk
+   openjdk21 "22.0.2"
+   "1nj414yj6v9qrlm48yv5llr4jmgj9g20v6zsd39xrdx4x4x4p3b6"
+   (arguments
+    (substitute-keyword-arguments (package-arguments base)
+      ((#:phases phases)
+       #~(modify-phases #$phases
+           (add-after 'unpack 'do-not-disable-new-dtags
+             (lambda _
+               ;; Our validate-runpath phases checks for RUNPATH, not RPATH.
+               (substitute* "make/autoconf/flags-cflags.m4"
+                 ((" -Wl,--disable-new-dtags") ""))))))))))
+
 ;;; Convenience alias to point to the latest version of OpenJDK.
 (define-public openjdk openjdk21)
 
-- 
cgit v1.3