From f54171505725c6805023d44195e9d11d2c7bbc03 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 7 Jul 2016 18:54:32 +0000 Subject: [PATCH] gnustep: fix gdomap service This gets rid of the rest of the pidfile stuff and makes gdomap just act like a normal systemd process. Also reword "enable" option. --- nixos/modules/services/networking/gdomap.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/networking/gdomap.nix b/nixos/modules/services/networking/gdomap.nix index 7f2d2159b48..b3fd91d037f 100644 --- a/nixos/modules/services/networking/gdomap.nix +++ b/nixos/modules/services/networking/gdomap.nix @@ -11,8 +11,8 @@ in # options = { services.gdomap = { - enable = mkEnableOption "Whether to enable gdomap, the GNUstep distributed objects daemon"; - }; + enable = mkEnableOption "GNUstep Distributed Objects name server"; + }; }; # @@ -26,16 +26,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ pkgs.gnustep.base ]; - serviceConfig = { - PIDFile = cfg.pidfile; - ExecStart = "@${pkgs.gnustep.base}/bin/gdomap" - + " -d -p" - + " -I ${cfg.pidfile}"; - Restart = "always"; - RestartSec = 2; - TimeoutStartSec = "30"; - Type = "forking"; - }; + serviceConfig.ExecStart = "${pkgs.gnustep.base}/bin/gdomap -f"; }; }; }