diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-09-12 09:34:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 09:34:22 +0200 |
| commit | 99b291c73c589a1b807bb6c4e7a727d9a994e495 (patch) | |
| tree | dbfa3a5171854c431eb096dd13dd147b253fcaf7 | |
| parent | 4bb69053f19fe6497f963c9ba8a1fb252bdb4537 (diff) | |
| parent | 968d4643b0380238af6abeac56b794a7f45e7ea7 (diff) | |
| download | nixlib-99b291c73c589a1b807bb6c4e7a727d9a994e495.tar nixlib-99b291c73c589a1b807bb6c4e7a727d9a994e495.tar.gz nixlib-99b291c73c589a1b807bb6c4e7a727d9a994e495.tar.bz2 nixlib-99b291c73c589a1b807bb6c4e7a727d9a994e495.tar.lz nixlib-99b291c73c589a1b807bb6c4e7a727d9a994e495.tar.xz nixlib-99b291c73c589a1b807bb6c4e7a727d9a994e495.tar.zst nixlib-99b291c73c589a1b807bb6c4e7a727d9a994e495.zip | |
Merge pull request #68507 from peterhoeg/f/mtr
nixos/mtr: support for selecting the package
| -rw-r--r-- | nixos/modules/programs/mtr.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/networking/mtr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/nixos/modules/programs/mtr.nix b/nixos/modules/programs/mtr.nix index 1fdec4c04f68..75b710c1584f 100644 --- a/nixos/modules/programs/mtr.nix +++ b/nixos/modules/programs/mtr.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.programs.mtr; + in { options = { programs.mtr = { @@ -15,13 +16,22 @@ in { setcap wrapper for it. ''; }; + + package = mkOption { + type = types.package; + default = pkgs.mtr; + description = '' + The package to use. + ''; + }; }; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ mtr ]; + environment.systemPackages = with pkgs; [ cfg.package ]; + security.wrappers.mtr-packet = { - source = "${pkgs.mtr}/bin/mtr-packet"; + source = "${cfg.package}/bin/mtr-packet"; capabilities = "cap_net_raw+p"; }; }; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 1acd513be31f..217f3b7d7cc8 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig , libcap, ncurses , withGtk ? false, gtk2 ? null }: assert withGtk -> gtk2 != null; stdenv.mkDerivation rec { - pname = "mtr"; + pname = "mtr${lib.optionalString withGtk "-gui"}"; version = "0.93"; src = fetchFromGitHub { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16469d05491e..cb516caad813 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4860,6 +4860,8 @@ in mtr = callPackage ../tools/networking/mtr {}; + mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; }; + mtx = callPackage ../tools/backup/mtx {}; mt-st = callPackage ../tools/backup/mt-st {}; |