diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index f02e77753bc5..343363332bf6 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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42d96042bfeb..b24e0955a7c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25093,7 +25093,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"; };