Merge pull request #66011 from peterhoeg/u/mtr

mtr: 0.92 -> 0.93

pkgs/tools/networking/mtr/default.nix

@@ -1,38 +1,42 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, libcap, ncurses
 , withGtk ? false, gtk2 ? null }:
 
 assert withGtk -> gtk2 != null;
 
 stdenv.mkDerivation rec {
-  name="mtr-${version}";
-  version="0.92";
+  pname = "mtr";
+  version = "0.93";
 
   src = fetchFromGitHub {
     owner  = "traviscross";
     repo   = "mtr";
     rev    = "v${version}";
-    sha256 = "0ca2ml846cv0zzkpd8y7ah6i9b3czrr8wlxja3cray94ybwb294d";
+    sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw";
   };
 
-  preConfigure = ''
+  # we need this before autoreconfHook does its thing
+  postPatch = ''
     echo ${version} > .tarball-version
+  '';
 
-    ./bootstrap.sh
-
-    substituteInPlace Makefile.in --replace ' install-exec-hook' ""
+  # and this after autoreconfHook has generated Makefile.in
+  preConfigure = ''
+    substituteInPlace Makefile.in \
+      --replace ' install-exec-hook' ""
   '';
 
   configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  buildInputs = [ ncurses ] ++ stdenv.lib.optional withGtk gtk2;
+  buildInputs = [ libcap ncurses ] ++ stdenv.lib.optional withGtk gtk2;
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A network diagnostics tool";
-    homepage    = http://www.bitwizard.nl/mtr/;
+    homepage    = "https://www.bitwizard.nl/mtr/";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ koral orivej raskin ];
     platforms   = platforms.unix;