Merge pull request #147682 from fabaff/bump-mbuffer

mbuffer: 20210328 -> 20211018

pkgs/tools/misc/mbuffer/default.nix

@@ -1,32 +1,40 @@
-{ lib, stdenv, fetchurl,
-  openssl,
- } :
+{ lib
+, stdenv
+, fetchurl
+, openssl
+, which
+}:
 
 stdenv.mkDerivation rec {
-  version = "20210328";
   pname = "mbuffer";
+  version = "20211018";
 
   src = fetchurl {
     url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
-    sha256 = "sha256-UbW42EiJkaVf4d/OkBMPnke8HOKGugO09ijAS3hP3F0=";
+    sha256 = "sha256-4kDB5OSsFMKL6MZg7EfUTOFrHo7JKqkHrRMAT/1dtuM=";
   };
 
-  buildInputs = [ openssl ];
+  buildInputs = [
+    openssl
+    which
+  ];
 
   # The mbuffer configure scripts fails to recognize the correct
   # objdump binary during cross-building for foreign platforms.
   # The correct objdump is exposed via the environment variable
   # $OBJDUMP, which should be used in such cases.
   preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-    substituteInPlace configure --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}'
+    substituteInPlace configure \
+      --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}'
   '';
+
   doCheck = true;
 
-  meta = {
-    homepage = "https://www.maier-komor.de/mbuffer.html";
+  meta = with lib; {
     description  = "A tool for buffering data streams with a large set of unique features";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ tokudan ];
-    platforms = lib.platforms.linux; # Maybe other non-darwin Unix
+    homepage = "https://www.maier-komor.de/mbuffer.html";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ tokudan ];
+    platforms = platforms.linux; # Maybe other non-darwin Unix
   };
 }