diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-09-25 12:37:21 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-09-25 13:12:32 +1000 |
| commit | 9979d33ac7c4f2dcf182f50e63ee1957b869d46d (patch) | |
| tree | 584d962f6c15c2da48dd52ed4bce50be5e89ffe7 /pkgs/tools/networking/mtr | |
| parent | e247ea75622a94766aaca655d460ec2e175abc29 (diff) | |
| download | nixpkgs-9979d33ac7c4f2dcf182f50e63ee1957b869d46d.tar nixpkgs-9979d33ac7c4f2dcf182f50e63ee1957b869d46d.tar.gz nixpkgs-9979d33ac7c4f2dcf182f50e63ee1957b869d46d.tar.bz2 nixpkgs-9979d33ac7c4f2dcf182f50e63ee1957b869d46d.tar.lz nixpkgs-9979d33ac7c4f2dcf182f50e63ee1957b869d46d.tar.xz nixpkgs-9979d33ac7c4f2dcf182f50e63ee1957b869d46d.tar.zst nixpkgs-9979d33ac7c4f2dcf182f50e63ee1957b869d46d.zip | |
mtr: 0.93 -> 0.94
https://github.com/traviscross/mtr/blob/v0.94/NEWS
Diffstat (limited to 'pkgs/tools/networking/mtr')
| -rw-r--r-- | pkgs/tools/networking/mtr/default.nix | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index ae5695537af..6b8b2f92374 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; |