diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index f7f5f36a6d0e..7e6d5f02ddfc 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, python +, python311Packages , makeWrapper , gawk , bash @@ -40,7 +40,11 @@ stdenv.mkDerivation rec { url = "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz"; }; - nativeBuildInputs = [ makeWrapper ]; + pythonPath = with python311Packages; [ cassandra-driver ]; + + nativeBuildInputs = [ python311Packages.wrapPython ]; + + buildInputs = [ python311Packages.python ] ++ pythonPath; installPhase = '' runHook preInstall @@ -98,11 +102,18 @@ stdenv.mkDerivation rec { fi done - wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin - runHook postInstall ''; + postFixup = '' + # Remove cassandra bash script wrapper. + # The wrapper searches for a suitable python version and is not necessary with Nix. + rm $out/bin/cqlsh + # Make "cqlsh.py" accessible by invoking "cqlsh" + ln -s $out/bin/cqlsh.py $out/bin/cqlsh + wrapPythonPrograms + ''; + passthru = { tests = let