b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

abcl: fix (require :jss) in ABCL with Java 17

Browse source
This commit is contained in:
Kasper Gałkowski 2022-04-29 23:34:02 +02:00
parent e00fbf7fcc
commit 7cf2cebcb2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/compilers/abcl/default.nix
View file

@ -18,13 +18,18 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
ant 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 = '' installPhase = ''
mkdir -p "$out"/{bin,share/doc/abcl,lib/abcl} mkdir -p "$out"/{bin,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/"
echo "#! ${stdenv.shell}" >> "$out/bin/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/* chmod a+x "$out"/bin/*
''; '';
buildInputs = [jre ant jdk jre]; buildInputs = [jre ant jdk jre];