mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-14 16:14:50 +00:00
abcl: fix visibility of CLASSPATH
This commit is contained in:
parent
568ecee159
commit
993ce594b5
@ -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
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user