Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c61b20396f23
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3c5a9bf17d1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 16, 2018

  1. nixos/synergy: Use graphical target (fixes #9468)

    @WhittlesJr
    WhittlesJr committed Aug 16, 2018
    Copy the full SHA
    9a63f51 View commit details

  2. Merge pull request #40747 from WhittlesJr/synergy-fix 

    services.synergy: Use graphical target (fixes #9468)
    @infinisil
    infinisil authored Aug 16, 2018
    Copy the full SHA
    d3c5a9b View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 nixos/modules/services/misc/synergy.nix
12 changes: 6 additions & 6 deletions nixos/modules/services/misc/synergy.nix
View file
Original file line number Diff line number Diff line change
@@ -83,20 +83,20 @@ in

config = mkMerge [
(mkIf cfgC.enable {
systemd.services."synergy-client" = {
after = [ "network.target" ];
systemd.user.services."synergy-client" = {
after = [ "network.target" "graphical-session.target" ];
description = "Synergy client";
wantedBy = optional cfgC.autoStart "multi-user.target";
wantedBy = optional cfgC.autoStart "graphical-session.target";
path = [ pkgs.synergy ];
serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}'';
serviceConfig.Restart = "on-failure";
};
})
(mkIf cfgS.enable {
systemd.services."synergy-server" = {
after = [ "network.target" ];
systemd.user.services."synergy-server" = {
after = [ "network.target" "graphical-session.target" ];
description = "Synergy server";
wantedBy = optional cfgS.autoStart "multi-user.target";
wantedBy = optional cfgS.autoStart "graphical-session.target";
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.Restart = "on-failure";