Merge pull request #145990 from jakubgs/fix-mtr-json-output

mtr: fix JSON output format, add libjansson

authored by

Michael Raskin and committed by
GitHub
7c5cadc3 2b319e65

+2 -2
+2 -2
pkgs/tools/networking/mtr/default.nix
··· 1 { stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config 2 - , libcap, ncurses 3 , withGtk ? false, gtk3 }: 4 5 stdenv.mkDerivation rec { ··· 28 29 nativeBuildInputs = [ autoreconfHook pkg-config ]; 30 31 - buildInputs = [ ncurses ] 32 ++ lib.optional withGtk gtk3 33 ++ lib.optional stdenv.isLinux libcap; 34
··· 1 { stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config 2 + , libcap, ncurses, jansson 3 , withGtk ? false, gtk3 }: 4 5 stdenv.mkDerivation rec { ··· 28 29 nativeBuildInputs = [ autoreconfHook pkg-config ]; 30 31 + buildInputs = [ ncurses jansson ] 32 ++ lib.optional withGtk gtk3 33 ++ lib.optional stdenv.isLinux libcap; 34