public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #98701 from zowoq/mtr

Browse Source 
mtr: 0.93 -> 0.94
This commit is contained in:
Michael Raskin 2020-09-25 07:37:37 +00:00 committed by GitHub
commit 7ad04f4beb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/tools/networking/mtr/default.nix
View File

@ -1,27 +1,19 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig { stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config
, libcap, ncurses , libcap, ncurses
, withGtk ? false, gtk2 ? null }: , withGtk ? false, gtk3 ? null }:
assert withGtk -> gtk2 != null; assert withGtk -> gtk3 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mtr${lib.optionalString withGtk "-gui"}"; pname = "mtr${lib.optionalString withGtk "-gui"}";
version = "0.93"; version = "0.94";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "traviscross"; owner = "traviscross";
repo = "mtr"; repo = "mtr";
rev = "v${version}"; 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 # we need this before autoreconfHook does its thing
postPatch = '' postPatch = ''
@ -36,10 +28,10 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk"; configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk";
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ ncurses ] buildInputs = [ ncurses ]
++ stdenv.lib.optional withGtk gtk2 ++ stdenv.lib.optional withGtk gtk3
++ stdenv.lib.optional stdenv.isLinux libcap; ++ stdenv.lib.optional stdenv.isLinux libcap;
enableParallelBuilding = true; enableParallelBuilding = true;