diff options
| author | Kasper Gałkowski <kpg@posteo.net> | 2022-04-29 23:34:02 +0200 |
|---|---|---|
| committer | Kasper Gałkowski <kpg@posteo.net> | 2022-04-29 23:49:50 +0200 |
| commit | 7cf2cebcb2afa5d4c14637f6aa4a5b5985747e6f (patch) | |
| tree | 2c8c4ece99f1ec7b06090ad40b4899ff3f5c0c46 | |
| parent | e00fbf7fccf9a7cc3c016cbe9e6df6229ed9ebed (diff) | |
| download | nixpkgs-7cf2cebcb2afa5d4c14637f6aa4a5b5985747e6f.tar nixpkgs-7cf2cebcb2afa5d4c14637f6aa4a5b5985747e6f.tar.gz nixpkgs-7cf2cebcb2afa5d4c14637f6aa4a5b5985747e6f.tar.bz2 nixpkgs-7cf2cebcb2afa5d4c14637f6aa4a5b5985747e6f.tar.lz nixpkgs-7cf2cebcb2afa5d4c14637f6aa4a5b5985747e6f.tar.xz nixpkgs-7cf2cebcb2afa5d4c14637f6aa4a5b5985747e6f.tar.zst nixpkgs-7cf2cebcb2afa5d4c14637f6aa4a5b5985747e6f.zip | |
abcl: fix `(require :jss)` in ABCL with Java 17
| -rw-r--r-- | pkgs/development/compilers/abcl/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index f3a3541e7cf..756e6c917c3 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]; |