diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index ae5695537af4..6b8b2f923745 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,27 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config , libcap, ncurses -, withGtk ? false, gtk2 ? null }: +, withGtk ? false, gtk3 ? null }: -assert withGtk -> gtk2 != null; +assert withGtk -> gtk3 != null; stdenv.mkDerivation rec { pname = "mtr${lib.optionalString withGtk "-gui"}"; - version = "0.93"; + version = "0.94"; src = fetchFromGitHub { owner = "traviscross"; repo = "mtr"; rev = "v${version}"; - sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw"; + sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6"; }; - - patches = [ - # https://github.com/traviscross/mtr/pull/315 - (fetchpatch { - url = "https://github.com/traviscross/mtr/pull/315.patch?full_index=1"; - sha256 = "18qcsj9058snc2qhq6v6gdbqhz021gi5fgw9h7vfczv45gf0qasa"; - }) - ]; # we need this before autoreconfHook does its thing postPatch = '' @@ -36,10 +28,10 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optional withGtk gtk2 + ++ stdenv.lib.optional withGtk gtk3 ++ stdenv.lib.optional stdenv.isLinux libcap; enableParallelBuilding = true;