diff options
author | Daniel Schaefer <git@danielschaefer.me> | 2019-04-09 06:31:55 +0200 |
---|---|---|
committer | Daniel Schaefer <git@danielschaefer.me> | 2019-06-13 04:36:41 +0200 |
commit | d8ad5ad2a241049e49a527c1b24bf7f738ffb30c (patch) | |
tree | d590717fdbe04f4028f88ed6bfeaef16cfb58129 /pkgs/servers/nosql/cassandra | |
parent | 6778ee186299ab56f141785a88abfb76f6814147 (diff) |
cassandra: Properly wrap all binaries
Would previously overwrite the binary with the wrapper and thus wrap itself (resulting in an infinite recursion on execution) for the binaries in /bin.t
Diffstat (limited to 'pkgs/servers/nosql/cassandra')
-rw-r--r-- | pkgs/servers/nosql/cassandra/generic.nix | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index eaa85e69bec01..05f572c8caaa4 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper coreutils ]; installPhase = '' mkdir $out @@ -51,8 +51,17 @@ stdenv.mkDerivation rec { bin/sstablescrub \ bin/sstableupgrade \ bin/sstableutil \ - bin/sstableverify \ - tools/bin/cassandra-stress \ + bin/sstableverify; do + # Check if file exists because some don't exist across all versions + if [ -f $out/$cmd ]; then + wrapProgram $out/bin/$(basename "$cmd") \ + --suffix-each LD_LIBRARY_PATH : ${libPath} \ + --prefix PATH : ${binPath} \ + --set JAVA_HOME ${jre} + fi + done + + for cmd in tools/bin/cassandra-stress \ tools/bin/cassandra-stressd \ tools/bin/sstabledump \ tools/bin/sstableexpiredblockers \ @@ -62,11 +71,9 @@ stdenv.mkDerivation rec { 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 + # Check if file exists because some don't exist across all versions if [ -f $out/$cmd ]; then - makeWrapper $out/$cmd $out/bin/$(${coreutils}/bin/basename "$cmd") \ + makeWrapper $out/$cmd $out/bin/$(basename "$cmd") \ --suffix-each LD_LIBRARY_PATH : ${libPath} \ --prefix PATH : ${binPath} \ --set JAVA_HOME ${jre} |