git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #66011 from peterhoeg/u/mtr

mtr: 0.92 -> 0.93

commit89721e495444149c1a7faaf9d0d21c2e56a35126 authorMichael Raskin <7c6f434c@mail.ru> dateMon 5 Aug 2019, 07:43 (7 years ago) parent16821b932526e6
1 file changed+14−10
pkgs/tools/networking/mtr/default.nix+14−10
pkgs/tools/networking/mtr/default.nix+14−10
@@ -1,38 +1,42 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
2+, libcap, ncurses
23, withGtk ? false, gtk2 ? null }:
34
45assert withGtk -> gtk2 != null;
56
67stdenv.mkDerivation rec {
7− name="mtr-${version}";
8− version="0.92";
8+ pname = "mtr";
9+ version = "0.93";
910
1011 src = fetchFromGitHub {
1112 owner = "traviscross";
1213 repo = "mtr";
1314 rev = "v${version}";
14− sha256 = "0ca2ml846cv0zzkpd8y7ah6i9b3czrr8wlxja3cray94ybwb294d";
15+ sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw";
1516 };
1617
17− preConfigure = ''
18+ # we need this before autoreconfHook does its thing
19+ postPatch = ''
1820 echo ${version} > .tarball-version
21+ '';
1922
20− ./bootstrap.sh
21−
22− substituteInPlace Makefile.in --replace ' install-exec-hook' ""
23+ # and this after autoreconfHook has generated Makefile.in
24+ preConfigure = ''
25+ substituteInPlace Makefile.in \
26+ --replace ' install-exec-hook' ""
2327 '';
2428
2529 configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk";
2630
2731 nativeBuildInputs = [ autoreconfHook pkgconfig ];
2832
29− buildInputs = [ ncurses ] ++ stdenv.lib.optional withGtk gtk2;
33+ buildInputs = [ libcap ncurses ] ++ stdenv.lib.optional withGtk gtk2;
3034
3135 enableParallelBuilding = true;
3236
3337 meta = with stdenv.lib; {
3438 description = "A network diagnostics tool";
35− homepage = http://www.bitwizard.nl/mtr/;
39+ homepage = "https://www.bitwizard.nl/mtr/";
3640 license = licenses.gpl2;
3741 maintainers = with maintainers; [ koral orivej raskin ];
3842 platforms = platforms.unix;