From 240a59d42867133158179876ecb30e922c71fe1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B6ger?= <jonas.roeger@tu-dortmund.de>
Date: Wed, 20 Nov 2024 20:18:00 +0100
Subject: [PATCH] System Gen134 @ 2024-11-20-20:17:59

---
 modules/derivations/antlr.nix      | 28 ----------------------------
 modules/derivations/antlrworks.nix | 29 +++++++++++++++++++++++++++++
 modules/programs.nix               |  6 +++---
 3 files changed, 32 insertions(+), 31 deletions(-)
 delete mode 100644 modules/derivations/antlr.nix
 create mode 100644 modules/derivations/antlrworks.nix

diff --git a/modules/derivations/antlr.nix b/modules/derivations/antlr.nix
deleted file mode 100644
index c0c1aff..0000000
--- a/modules/derivations/antlr.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  pkgs ? import <nixpkgs> {},
-  version ? "3.5.3",
-  hash ? "sha256-JMlDvaNRC/qEnD6uEts32kh9IEU2/wgHTsHz3Z3fq0M=",
-  jre ? pkgs.jre,
-  ...
-}:
-pkgs.stdenv.mkDerivation {
-  pname = "antlr";
-  inherit version;
-
-  dontUnpack = true;
-  src = pkgs.fetchurl {
-    url = "https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-${version}-complete.jar";
-    inherit hash;
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/java
-    cp $src $out/share/java/antlr-${version}-complete.jar
-    mkdir $out/bin
-    cat > $out/bin/antlr <<EOF
-    #!/bin/sh
-    exec ${jre}/bin/java -jar $out/share/java/antlr-${version}-complete.jar "$@"
-    EOF
-    chmod +x $out/bin/antlr
-  '';
-}
diff --git a/modules/derivations/antlrworks.nix b/modules/derivations/antlrworks.nix
new file mode 100644
index 0000000..3f918e8
--- /dev/null
+++ b/modules/derivations/antlrworks.nix
@@ -0,0 +1,29 @@
+{
+  pkgs ? import <nixpkgs> {},
+  version ? "1.5.2",
+  hash ? "sha256-Yy9x7cSQrRpk+Flt9+H7gdogUS4WR2q2fqdVXQgvd7Y=",
+  jre ? pkgs.jre,
+  ...
+}:
+pkgs.stdenv.mkDerivation {
+  pname = "antlrworks";
+  inherit version;
+
+  dontUnpack = true;
+  src = pkgs.fetchurl {
+    url = "https://github.com/antlr/website-antlr3/raw/refs/heads/gh-pages/download/antlrworks-${version}-complete.jar";
+    inherit hash;
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/java
+    cp $src $out/share/java/antlrworks-${version}-complete.jar
+    mkdir $out/bin
+    cat > $out/bin/antlrworks <<EOF
+    #!/usr/bin/env sh
+    export CLASSPATH=$out/share/java/antlrworks-${version}-complete.jar:$CLASSPATH
+    ${jre}/bin/java org.antlr.Tool
+    EOF
+    chmod +x $out/bin/antlrworks
+  '';
+}
diff --git a/modules/programs.nix b/modules/programs.nix
index 99564c0..9d45f62 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: let
-  antlr-works =
+  antlrworks =
     import
-    ./derivations/antlr.nix
+    ./derivations/antlrworks.nix
     {inherit pkgs;};
   RStudio-with-my-packages =
     pkgs.rstudioWrapper.override
@@ -19,7 +19,7 @@
 in {
   environment.systemPackages = [
     RStudio-with-my-packages
-    antlr-works
+    antlrworks
     pkgs.age
     pkgs.alejandra
     pkgs.arduino