From 94a6db6cda3df2889883189bb5ed2d643da2ad08 Mon Sep 17 00:00:00 2001
From: Francesco Lazzarino <flazzarino@gmail.com>
Date: Fri, 3 Oct 2014 17:31:39 -0500
Subject: [PATCH] cassandra: environment fix for cassandra shell script

---
 pkgs/servers/nosql/cassandra/default.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/default.nix b/pkgs/servers/nosql/cassandra/default.nix
index 4a0511de0662..1413888f3f1b 100644
--- a/pkgs/servers/nosql/cassandra/default.nix
+++ b/pkgs/servers/nosql/cassandra/default.nix
@@ -1,4 +1,12 @@
-{stdenv, fetchurl, jre, python, makeWrapper}:
+{ stdenv
+, fetchurl
+, jre
+, python
+, makeWrapper
+, gawk
+, bash
+, getopt
+}:
 
 let version = "2.1.0";
 in stdenv.mkDerivation rec {
@@ -16,10 +24,14 @@ in stdenv.mkDerivation rec {
     mv * $out
 
     for cmd in cassandra nodetool sstablekeys sstableloader sstableupgrade
-      do wrapProgram $out/bin/$cmd --set JAVA_HOME ${jre}
+      do wrapProgram $out/bin/$cmd \
+        --set JAVA_HOME ${jre} \
+        --prefix PATH : ${bash}/bin \
+        --prefix PATH : ${getopt}/bin \
+        --prefix PATH : ${gawk}/bin
     done
 
-    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}
+    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
     '';
 
   meta = {