summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2018-08-08 19:10:20 +0800
committerPeter Hoeg <peter@hoeg.com>2018-08-08 19:10:29 +0800
commit83a096d042e0aa9f59ad339876157bab7f77074f (patch)
tree461ee566cf961ff0bc366fa2b71f59029b4af9e8
parentd0f6e59c746375e8b5f1f0918c1e567d292ba0da (diff)
downloadnixlib-83a096d042e0aa9f59ad339876157bab7f77074f.tar
nixlib-83a096d042e0aa9f59ad339876157bab7f77074f.tar.gz
nixlib-83a096d042e0aa9f59ad339876157bab7f77074f.tar.bz2
nixlib-83a096d042e0aa9f59ad339876157bab7f77074f.tar.lz
nixlib-83a096d042e0aa9f59ad339876157bab7f77074f.tar.xz
nixlib-83a096d042e0aa9f59ad339876157bab7f77074f.tar.zst
nixlib-83a096d042e0aa9f59ad339876157bab7f77074f.zip
fio: 3.7 -> 3.8
-rw-r--r--pkgs/tools/system/fio/default.nix27
1 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 2a5eea0b2516..261f4cee2b83 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, libaio, python, zlib }:
-
-let
-  version = "3.7";
-  sha256 = "1m2slyxhzyznq283m6ljjgjg38i0hxg537bwhfs12qskv00c4vsk";
-in
+{ stdenv, fetchFromGitHub, makeWrapper
+, libaio, python, zlib
+, withGnuplot ? false, gnuplot ? null }:
 
 stdenv.mkDerivation rec {
   name = "fio-${version}";
+  version = "3.8";
 
   src = fetchFromGitHub {
-    owner = "axboe";
-    repo = "fio";
-    rev = "fio-${version}";
-    inherit sha256;
+    owner  = "axboe";
+    repo   = "fio";
+    rev    = "fio-${version}";
+    sha256 = "1krifr4ms7x229a3p088zl5rpdrfwz6bw4c2lrz3hksignjxaw91";
   };
 
   buildInputs = [ python zlib ]
     ++ stdenv.lib.optional (!stdenv.isDarwin) libaio;
 
+  nativeBuildInputs = [ makeWrapper ];
+
   enableParallelBuilding = true;
 
   postPatch = ''
@@ -27,9 +27,14 @@ stdenv.mkDerivation rec {
     substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio
   '';
 
+  postInstall = stdenv.lib.optionalString withGnuplot ''
+    wrapProgram $out/bin/fio2gnuplot \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ gnuplot ]}
+  '';
+
   meta = with stdenv.lib; {
-    homepage = "http://git.kernel.dk/?p=fio.git;a=summary;";
     description = "Flexible IO Tester - an IO benchmark tool";
+    homepage = "http://git.kernel.dk/?p=fio.git;a=summary;";
     license = licenses.gpl2;
     platforms = platforms.unix;
   };