From 6fe1b5b11010b2b5c4f3e5a20f3c702be92c1490 Mon Sep 17 00:00:00 2001
From: iwei20 <ivanw8288@gmail.com>
Date: Thu, 29 May 2025 20:27:02 -0700
Subject: [PATCH] Update and fix jextract for jdk23

---
 pkgs/by-name/je/jextract/copy_lib_clang.patch | 13 +++++++++++++
 pkgs/by-name/je/jextract/package.nix          | 14 ++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/je/jextract/copy_lib_clang.patch

diff --git a/pkgs/by-name/je/jextract/copy_lib_clang.patch b/pkgs/by-name/je/jextract/copy_lib_clang.patch
new file mode 100644
index 0000000000000..4b910ae275bdf
--- /dev/null
+++ b/pkgs/by-name/je/jextract/copy_lib_clang.patch
@@ -0,0 +1,13 @@
+diff --git a/build.gradle b/build.gradle
+index 9ce544a..0c77609 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -79,7 +79,7 @@ task copyLibClang(type: Sync) {
+             "libclang.so.${clang_version}" : "*clang*"
+ 
+     from("${libclang_dir}") {
+-        include(clang_path_include)
++        include("libclang.so*")
+         include("libLLVM.*")
+         exclude("clang.exe")
+         into("libs")
diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix
index 65c28acc2e4c2..46ddcad2cf1c9 100644
--- a/pkgs/by-name/je/jextract/package.nix
+++ b/pkgs/by-name/je/jextract/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation {
   pname = "jextract";
-  version = "unstable-2024-03-13";
+  version = "unstable-2025-05-08";
 
   src = fetchFromGitHub {
     owner = "openjdk";
     repo = "jextract";
-    rev = "b9ec8879cff052b463237fdd76382b3a5cd8ff2b";
-    hash = "sha256-+4AM8pzXPIO/CS3+Rd/jJf2xDvAo7K7FRyNE8rXvk5U=";
+    rev = "ab6b30fd189e33a52d366846202f2e9b9b280142";
+    hash = "sha256-cFXQo/DpjOuuW+HCP2G9HiOqdgVmmyPd3IXCB9X+w6M=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,11 @@ stdenv.mkDerivation {
 
   gradleFlags = [
     "-Pllvm_home=${lib.getLib llvmPackages.libclang}"
-    "-Pjdk22_home=${jdk23}"
+    "-Pjdk_home=${jdk23}"
+  ];
+
+  patches = [
+    ./copy_lib_clang.patch
   ];
 
   doCheck = true;
@@ -53,7 +57,5 @@ stdenv.mkDerivation {
       jlesquembre
       sharzy
     ];
-    # Not yet updated for JDK 23
-    broken = true;
   };
 }