Skip to content

Commit

Permalink
cassandra: Wrap new binaries (#59090)
Browse files Browse the repository at this point in the history
The new releases of cassandra added some binaries that the install
script didn't wrap and thus were unusable.
  • Loading branch information
JohnAZoidberg authored and xeji committed Apr 7, 2019
1 parent 0fba99d commit 2e6b8ae
Showing 1 changed file with 21 additions and 7 deletions.
28 changes: 21 additions & 7 deletions pkgs/servers/nosql/cassandra/generic.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, makeWrapper, gawk, bash, getopt, procps
, which, jre, version, sha256, ...
, which, jre, version, sha256, coreutils, ...
}:

let
Expand Down Expand Up @@ -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}
Expand Down

0 comments on commit 2e6b8ae

Please sign in to comment.