Merge pull request #153918 from Mic92/fio

fio: add missing six dependency
This commit is contained in:
Jörg Thalheim 2022-01-08 00:23:20 +00:00 committed by GitHub
commit 4601b356f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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; {