diff options
Diffstat (limited to 'pkgs/development/compilers/abcl/default.nix')
| -rw-r--r-- | pkgs/development/compilers/abcl/default.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 317d0d92266d4..343363332bf60 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 ''; @@ -62,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = ./update.sh; meta = { - description = "A JVM-based Common Lisp implementation"; + description = "JVM-based Common Lisp implementation"; homepage = "https://common-lisp.net/project/armedbear/"; license = lib.licenses.gpl2Classpath; mainProgram = "abcl"; |