Merge pull request #40747 from WhittlesJr/synergy-fix

services.synergy: Use graphical target (fixes #9468)
This commit is contained in:
Silvan Mosberger 2018-08-16 16:55:38 +02:00 committed by GitHub
commit d3c5a9bf17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -83,20 +83,20 @@ in
config = mkMerge [ config = mkMerge [
(mkIf cfgC.enable { (mkIf cfgC.enable {
systemd.services."synergy-client" = { systemd.user.services."synergy-client" = {
after = [ "network.target" ]; after = [ "network.target" "graphical-session.target" ];
description = "Synergy client"; description = "Synergy client";
wantedBy = optional cfgC.autoStart "multi-user.target"; wantedBy = optional cfgC.autoStart "graphical-session.target";
path = [ pkgs.synergy ]; path = [ pkgs.synergy ];
serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}''; serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}'';
serviceConfig.Restart = "on-failure"; serviceConfig.Restart = "on-failure";
}; };
}) })
(mkIf cfgS.enable { (mkIf cfgS.enable {
systemd.services."synergy-server" = { systemd.user.services."synergy-server" = {
after = [ "network.target" ]; after = [ "network.target" "graphical-session.target" ];
description = "Synergy server"; description = "Synergy server";
wantedBy = optional cfgS.autoStart "multi-user.target"; wantedBy = optional cfgS.autoStart "graphical-session.target";
path = [ pkgs.synergy ]; path = [ pkgs.synergy ];
serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }''; serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }'';
serviceConfig.Restart = "on-failure"; serviceConfig.Restart = "on-failure";