From 993ce594b52b7c33bb94bdef5e709939b2c28992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= <galkowskikasper@gmail.com>
Date: Sat, 22 Jun 2024 04:11:23 +0200
Subject: [PATCH 1/2] abcl: fix visibility of CLASSPATH

---
 pkgs/development/compilers/abcl/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index 317d0d92266d..c681ff47cc8f 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -4,7 +4,6 @@
 , fetchurl
 , ant
 , jdk
-, jre
 , makeWrapper
 , stripJavaArchivesHook
 }:
@@ -36,7 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    ant
+    ant \
+      -Dabcl.runtime.jar.path="$out/lib/abcl/abcl.jar" \
+      -Dadditional.jars="$out/lib/abcl/abcl-contrib.jar"
 
     runHook postBuild
   '';
@@ -47,14 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p "$out"/{share/doc/abcl,lib/abcl}
     cp -r README COPYING CHANGES examples/  "$out/share/doc/abcl/"
     cp -r dist/*.jar contrib/ "$out/lib/abcl/"
-
-    makeWrapper ${jre}/bin/java $out/bin/abcl \
-      --add-flags "-classpath $out/lib/abcl/\*" \
-      ${lib.optionalString (lib.versionAtLeast jre.version "17")
-        # Fix for https://github.com/armedbear/abcl/issues/484
-        "--add-flags --add-opens=java.base/java.util.jar=ALL-UNNAMED \\"
-      }
-      --add-flags org.armedbear.lisp.Main
+    install -Dm555 abcl -t $out/bin
 
     runHook postInstall
   '';

From 16c4d0741989ed66741fb47fc2859a95fa20d49c Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Mon, 24 Jun 2024 19:39:34 -0400
Subject: [PATCH 2/2] abcl: force using OpenJDK 17 (specified upstream)

---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a23cccbcd12..196188533120 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25241,7 +25241,11 @@ with pkgs;
 
   # Armed Bear Common Lisp
   abcl = wrapLisp {
-    pkg = callPackage ../development/compilers/abcl { };
+    pkg = callPackage ../development/compilers/abcl {
+      # https://armedbear.common-lisp.dev/ lists OpenJDK 17 as the highest
+      # supported JDK.
+      jdk = openjdk17;
+    };
     faslExt = "abcl";
   };