From 2e6b8ae970e83b2518891f157d4075fb8a7991d1 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sun, 7 Apr 2019 15:53:57 +0200
Subject: [PATCH] cassandra: Wrap new binaries (#59090)

The new releases of cassandra added some binaries that the install
script didn't wrap and thus were unusable.
---
 pkgs/servers/nosql/cassandra/generic.nix | 28 ++++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 6ac087241ce..eaa85e69bec 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, makeWrapper, gawk, bash, getopt, procps
-, which, jre, version, sha256, ...
+, which, jre, version, sha256, coreutils, ...
 }:
 
 let
@@ -43,16 +43,30 @@ stdenv.mkDerivation rec {
       rmdir $out/doc
     fi
 
-    for cmd in bin/cassandra bin/nodetool bin/sstablekeys \
-      bin/sstableloader bin/sstableupgrade \
-      tools/bin/cassandra-stress tools/bin/cassandra-stressd \
-      tools/bin/sstablemetadata tools/bin/sstableofflinerelevel \
-      tools/bin/token-generator tools/bin/sstablelevelreset; do
+
+    for cmd in bin/cassandra \
+               bin/nodetool \
+               bin/sstablekeys \
+               bin/sstableloader \
+               bin/sstablescrub \
+               bin/sstableupgrade \
+               bin/sstableutil \
+               bin/sstableverify \
+               tools/bin/cassandra-stress \
+               tools/bin/cassandra-stressd \
+               tools/bin/sstabledump \
+               tools/bin/sstableexpiredblockers \
+               tools/bin/sstablelevelreset \
+               tools/bin/sstablemetadata \
+               tools/bin/sstableofflinerelevel \
+               tools/bin/sstablerepairedset \
+               tools/bin/sstablesplit \
+               tools/bin/token-generator; do
 
       # check if file exists because some bin tools don't exist across all
       # cassandra versions
       if [ -f $out/$cmd ]; then
-        wrapProgram $out/$cmd \
+        makeWrapper $out/$cmd $out/bin/$(${coreutils}/bin/basename "$cmd") \
           --suffix-each LD_LIBRARY_PATH : ${libPath} \
           --prefix PATH : ${binPath} \
           --set JAVA_HOME ${jre}