From f6f6990fc811454cb3082ba3662b711488fd0554 Mon Sep 17 00:00:00 2001 From: Kritnich Date: Mon, 26 Jul 2021 17:16:00 +0200 Subject: [PATCH] barrier: remove `tray` option (#2215) barrier's --no-tray CLI parameter is non-functional and so the option has been removed. --- modules/services/barrier.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/services/barrier.nix b/modules/services/barrier.nix index 5b34e1af6..7eaecc30d 100644 --- a/modules/services/barrier.nix +++ b/modules/services/barrier.nix @@ -6,6 +6,12 @@ in { meta.maintainers = with maintainers; [ kritnich ]; + imports = [ + (mkRemovedOptionModule [ "services" "barrier" "client" "tray" ] '' + The tray option is non-functional and has been removed. + '') + ]; + options.services.barrier = { client = { @@ -29,8 +35,6 @@ in { ''; }; - tray = mkEnableOption "the system tray icon" // { default = true; }; - enableCrypto = mkEnableOption "crypto (SSL) plugin" // { default = true; }; @@ -66,7 +70,6 @@ in { Service.ExecStart = with cfg.client; toString ([ "${pkgs.barrier}/bin/barrierc" ] ++ optional (name != null) "--name ${name}" - ++ optional (!tray) "--no-tray" ++ optional enableCrypto "--enable-crypto" ++ optional enableDragDrop "--enable-drag-drop" ++ extraFlags ++ [ server ]);