diff options
author | Daniel Schaefer <git@danielschaefer.me> | 2019-04-07 15:53:57 +0200 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2019-04-07 15:53:57 +0200 |
commit | 2e6b8ae970e83b2518891f157d4075fb8a7991d1 (patch) | |
tree | 29954b3d64ed977f254dda886fbb13ba885ed730 /pkgs/servers/nosql | |
parent | 0fba99dedf3620c83adf376653448397028b6455 (diff) |
cassandra: Wrap new binaries (#59090)
The new releases of cassandra added some binaries that the install script didn't wrap and thus were unusable.
Diffstat (limited to 'pkgs/servers/nosql')
-rw-r--r-- | pkgs/servers/nosql/cassandra/generic.nix | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 6ac087241ce0b..eaa85e69bec01 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} |