diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-01-08 18:19:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-08 18:19:09 +0000 |
| commit | f530bcb14300770f5887348e2156a39b419418fc (patch) | |
| tree | ddbcc5b2a73f86ee3bc233e47bcba2db6df7feaf | |
| parent | Merge pull request #154012 from NixOS/backport-153171-to-release-21.11 (diff) | |
| parent | fio: add missing six dependency (diff) | |
| download | nixpkgs-f530bcb14300770f5887348e2156a39b419418fc.tar.gz | |
Merge pull request #153926 from NixOS/backport-153918-to-release-21.11
[Backport release-21.11] fio: add missing six dependency
| -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; { |