From de6739642c187656e8426496adc0e3926c0ad2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 8 Jan 2022 00:42:21 +0100 Subject: [PATCH] fio: add missing six dependency --- pkgs/tools/system/fio/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index c15c623f374d..859fbe72d631 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ python3 zlib ] ++ lib.optional (!stdenv.isDarwin) libaio; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper python3.pkgs.wrapPython ]; strictDeps = true; @@ -29,9 +29,14 @@ stdenv.mkDerivation rec { substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio ''; - postInstall = lib.optionalString withGnuplot '' - wrapProgram $out/bin/fio2gnuplot \ - --prefix PATH : ${lib.makeBinPath [ gnuplot ]} + pythonPath = [ python3.pkgs.six ]; + + makeWrapperArgs = lib.optional withGnuplot [ + "--prefix PATH : ${lib.makeBinPath [ gnuplot ]}" + ]; + + postInstall = '' + wrapPythonProgramsIn "$out/bin" "$out $pythonPath" ''; meta = with lib; {