1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/tools/parsing/javacc/default.nix b/pkgs/development/tools/parsing/javacc/default.nix
index a3adad076cf0..0279ef8f89df 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";