From 0ccf8bf1df97f6c341b2a09b4f57489895a3bdc6 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Tue, 26 Dec 2017 20:07:32 +0100
Subject: jmeter: 2.11 -> 3.3 and fix java command not found

---
 pkgs/applications/networking/jmeter/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'pkgs/applications/networking/jmeter')

diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index db36c8dca617..a89898c37392 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -1,13 +1,17 @@
-{ fetchurl, stdenv, ant }:
+{ fetchurl, stdenv, jre }:
 
 stdenv.mkDerivation rec {
-  name = "jmeter-2.11";
+  name = "jmeter-3.3";
   src = fetchurl {
     url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
-    sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944";
+    sha256 = "190k6yrh5casadphkv4azp4nvf4wf2q85mrfysw67r9d96nb9kk5";
   };
 
+  buildInputs = [ jre ];
+
   installPhase = ''
+    substituteInPlace ./bin/jmeter.sh --replace "java $ARGS" "${jre}/bin/java $ARGS"
+    substituteInPlace ./bin/jmeter --replace "java $ARGS" "${jre}/bin/java $ARGS"
     mkdir $out
     cp ./* $out/ -R
   '';
-- 
cgit 1.4.1