From 7cf2cebcb2afa5d4c14637f6aa4a5b5985747e6f Mon Sep 17 00:00:00 2001
From: Kasper Gałkowski
Date: Fri, 29 Apr 2022 23:34:02 +0200
Subject: abcl: fix `(require :jss)` in ABCL with Java 17

---
 pkgs/development/compilers/abcl/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index f3a3541e7cf8..756e6c917c37 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -18,13 +18,18 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     ant
   '';
+  # Fix for https://github.com/armedbear/abcl/issues/484
+  javaOpts =
+    lib.optionalString
+      (lib.versionAtLeast jre.version "17")
+      "--add-opens=java.base/java.util.jar=ALL-UNNAMED";
   installPhase = ''
     mkdir -p "$out"/{bin,share/doc/abcl,lib/abcl}
     cp -r README COPYING CHANGES examples/  "$out/share/doc/abcl/"
     cp -r dist/*.jar contrib/ "$out/lib/abcl/"
 
     echo "#! ${stdenv.shell}" >> "$out/bin/abcl"
-    echo "${jre}/bin/java -cp \"$out/lib/abcl/abcl.jar:$out/lib/abcl/abcl-contrib.jar:\$CLASSPATH\" org.armedbear.lisp.Main \"\$@\"" >> "$out/bin/abcl"
+    echo "${jre}/bin/java $javaOpts -cp \"$out/lib/abcl/abcl.jar:$out/lib/abcl/abcl-contrib.jar:\$CLASSPATH\" org.armedbear.lisp.Main \"\$@\"" >> "$out/bin/abcl"
     chmod a+x "$out"/bin/*
   '';
   buildInputs = [jre ant jdk jre];
-- 
cgit 1.4.1