git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68507 from peterhoeg/f/mtr

nixos/mtr: support for selecting the package

commit99b291c73c589a1b807bb6c4e7a727d9a994e495 authorMaximilian Bosch <maximilian@mbosch.me> dateThu 12 Sep 2019, 09:34 (7 years ago) parent4bb6905968d464
3 files changed+16−4
nixos/modules/programs/mtr.nix+12−2 pkgs/tools/networking/mtr/default.nix+2−2 pkgs/top-level/all-packages.nix+2
nixos/modules/programs/mtr.nix+12−2
@@ -4,6 +4,7 @@ with lib;
44
55let
66 cfg = config.programs.mtr;
7+
78in {
89 options = {
910 programs.mtr = {
@@ -15,13 +16,22 @@ in {
1516 setcap wrapper for it.
1617 '';
1718 };
19+
20+ package = mkOption {
21+ type = types.package;
22+ default = pkgs.mtr;
23+ description = ''
24+ The package to use.
25+ '';
26+ };
1827 };
1928 };
2029
2130 config = mkIf cfg.enable {
22− environment.systemPackages = with pkgs; [ mtr ];
31+ environment.systemPackages = with pkgs; [ cfg.package ];
32+
2333 security.wrappers.mtr-packet = {
24− source = "${pkgs.mtr}/bin/mtr-packet";
34+ source = "${cfg.package}/bin/mtr-packet";
2535 capabilities = "cap_net_raw+p";
2636 };
2737 };
pkgs/tools/networking/mtr/default.nix+2−2
@@ -1,11 +1,11 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
1+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
22, libcap, ncurses
33, withGtk ? false, gtk2 ? null }:
44
55assert withGtk -> gtk2 != null;
66
77stdenv.mkDerivation rec {
8− pname = "mtr";
8+ pname = "mtr${lib.optionalString withGtk "-gui"}";
99 version = "0.93";
1010
1111 src = fetchFromGitHub {
pkgs/top-level/all-packages.nix+2
@@ -4860,6 +4860,8 @@ in
48604860
48614861 mtr = callPackage ../tools/networking/mtr {};
48624862
4863+ mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; };
4864+
48634865 mtx = callPackage ../tools/backup/mtx {};
48644866
48654867 mt-st = callPackage ../tools/backup/mt-st {};