diff options
author | Peter Hoeg <peter@hoeg.com> | 2019-08-05 11:46:24 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2019-08-05 11:46:24 +0800 |
commit | 32526e65bd94535194dd74a912dbdb71e3992712 (patch) | |
tree | ddf73b80f0965d8532951e3a1c4804874fb6f0e7 | |
parent | 525eaf407d4edb329ea48f6dc9c6590fb73c779a (diff) | |
download | nixlib-32526e65bd94535194dd74a912dbdb71e3992712.tar nixlib-32526e65bd94535194dd74a912dbdb71e3992712.tar.gz nixlib-32526e65bd94535194dd74a912dbdb71e3992712.tar.bz2 nixlib-32526e65bd94535194dd74a912dbdb71e3992712.tar.lz nixlib-32526e65bd94535194dd74a912dbdb71e3992712.tar.xz nixlib-32526e65bd94535194dd74a912dbdb71e3992712.tar.zst nixlib-32526e65bd94535194dd74a912dbdb71e3992712.zip |
mtr: 0.92 -> 0.93
-rw-r--r-- | pkgs/tools/networking/mtr/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 3c2ced1712fd..59242551f929 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/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; |