abcl: fix visibility of CLASSPATH

This commit is contained in:
Kasper Gałkowski 2024-06-22 04:11:23 +02:00
parent 568ecee159
commit 993ce594b5

View File

@ -4,7 +4,6 @@
, fetchurl , fetchurl
, ant , ant
, jdk , jdk
, jre
, makeWrapper , makeWrapper
, stripJavaArchivesHook , stripJavaArchivesHook
}: }:
@ -36,7 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
ant ant \
-Dabcl.runtime.jar.path="$out/lib/abcl/abcl.jar" \
-Dadditional.jars="$out/lib/abcl/abcl-contrib.jar"
runHook postBuild runHook postBuild
''; '';
@ -47,14 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p "$out"/{share/doc/abcl,lib/abcl} mkdir -p "$out"/{share/doc/abcl,lib/abcl}
cp -r README COPYING CHANGES examples/ "$out/share/doc/abcl/" cp -r README COPYING CHANGES examples/ "$out/share/doc/abcl/"
cp -r dist/*.jar contrib/ "$out/lib/abcl/" cp -r dist/*.jar contrib/ "$out/lib/abcl/"
install -Dm555 abcl -t $out/bin
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
runHook postInstall runHook postInstall
''; '';