diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-01-08 00:23:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-08 00:23:20 +0000 |
| commit | 4601b356f8d52f12c0f325585e89e16ef5952728 (patch) | |
| tree | 3d8cd9d20264e3e93554c3c872f771192a326d3a /pkgs/tools/system | |
| parent | c5e9e73029beb7cc25c10e8c712e1874b1c53d1a (diff) | |
| parent | de6739642c187656e8426496adc0e3926c0ad2d7 (diff) | |
| download | nixpkgs-4601b356f8d52f12c0f325585e89e16ef5952728.tar nixpkgs-4601b356f8d52f12c0f325585e89e16ef5952728.tar.gz nixpkgs-4601b356f8d52f12c0f325585e89e16ef5952728.tar.bz2 nixpkgs-4601b356f8d52f12c0f325585e89e16ef5952728.tar.lz nixpkgs-4601b356f8d52f12c0f325585e89e16ef5952728.tar.xz nixpkgs-4601b356f8d52f12c0f325585e89e16ef5952728.tar.zst nixpkgs-4601b356f8d52f12c0f325585e89e16ef5952728.zip | |
Merge pull request #153918 from Mic92/fio
fio: add missing six dependency
Diffstat (limited to 'pkgs/tools/system')
| -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 c15c623f374..859fbe72d63 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; { |