From 6952cab0299a21091f387f21acf904a2a5e97f56 Mon Sep 17 00:00:00 2001
From: Souvik Sen <88038050+invokes-su@users.noreply.github.com>
Date: Sun, 4 Sep 2022 01:16:34 +0100
Subject: [PATCH] javacc: 7.0.10 -> 7.0.12 (#187867)

Co-authored-by: R. Ryantm <ryantm-bot@ryantm.com>
Co-authored-by: Souvik Sen <nixpkgs-commits@deshaw.com>
---
 pkgs/development/tools/parsing/javacc/default.nix | 15 +++++++++++----
 pkgs/top-level/all-packages.nix                   |  3 +++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/parsing/javacc/default.nix b/pkgs/development/tools/parsing/javacc/default.nix
index a3adad076cf..0279ef8f89d 100644
--- a/pkgs/development/tools/parsing/javacc/default.nix
+++ b/pkgs/development/tools/parsing/javacc/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, lib, fetchFromGitHub, ant, jdk }:
+{ stdenv, lib, fetchFromGitHub, ant, jdk, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "javacc";
-  version = "7.0.10";
+  version = "7.0.12";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "120jva4sw1kylkwgqf869zxddss01mcn1nmimx9vmd4xaadz7cf2";
+    sha256 = "sha256-tDtstF3ivKjG01vOZ8Ga1zTjIZFSTWt5QPY1VQvyFMU=";
   };
 
-  nativeBuildInputs = [ ant jdk ];
+  nativeBuildInputs = [ ant jdk makeWrapper ];
 
   buildPhase = ''
     ant jar
@@ -21,8 +21,15 @@ stdenv.mkDerivation rec {
     mkdir -p $out/target
     mv scripts $out/bin
     mv target/javacc.jar $out/target/
+    find -L "$out/bin" -type f -executable -print0 \
+      | while IFS= read -r -d ''' file; do
+      wrapProgram "$file" --suffix PATH : ${jre}/bin
+    done
   '';
 
+  doCheck = true;
+  checkPhase = "ant test";
+
   meta = with lib; {
     homepage = "https://javacc.github.io/javacc";
     description = "A parser generator for building parsers from grammars";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e551ea3cef..e934b4e32a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16472,7 +16472,10 @@ with pkgs;
   ftjam = callPackage ../development/tools/build-managers/jam/ftjam.nix { };
 
   javacc = callPackage ../development/tools/parsing/javacc {
+    # Upstream doesn't support anything newer than Java 8.
+    # https://github.com/javacc/javacc/blob/c708628423b71ce8bc3b70143fa5b6a2b7362b3a/README.md#building-javacc-from-source
     jdk = jdk8;
+    jre = jre8;
   };
 
   jbake = callPackage ../development/tools/jbake { };