diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2022-01-08 00:42:21 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-01-08 00:27:24 +0000 |
| commit | daec3524d442f8ef53bcdf4afbcee08956d6d8fe (patch) | |
| tree | e67adf7f592d88157cbc83662557bf8bb1c745f5 | |
| parent | python3Packages.discordpy: relax aiohttp constraint (diff) | |
| download | nixpkgs-daec3524d442f8ef53bcdf4afbcee08956d6d8fe.tar.gz | |
fio: add missing six dependency
(cherry picked from commit de6739642c187656e8426496adc0e3926c0ad2d7)
| -rw-r--r-- | pkgs/tools/system/fio/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index dedcbc6f1e4c..10a26f1fd9ec 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; { |