From 2fac8b2740c56b5471f366f6f3f4ffa218f323e8 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 25 Dec 2018 18:45:12 +0200 Subject: [PATCH 1/3] syncthing: use proper output for binaries in services --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 9dfa7f9a0ab..722d0695cc6 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -71,11 +71,11 @@ in { substitute etc/linux-systemd/system/syncthing@.service \ $out/lib/systemd/system/syncthing@.service \ - --replace /usr/bin/syncthing $out/bin/syncthing + --replace /usr/bin/syncthing $bin/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ $out/lib/systemd/user/syncthing.service \ - --replace /usr/bin/syncthing $out/bin/syncthing + --replace /usr/bin/syncthing $bin/bin/syncthing ''; }; @@ -99,7 +99,7 @@ in { substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ $out/lib/systemd/system/strelaysrv.service \ - --replace /usr/bin/strelaysrv $out/bin/strelaysrv + --replace /usr/bin/strelaysrv $bin/bin/strelaysrv ''; }; } From 3fa5f623bfc570d2cc7bb38f3f11cd34e40c700b Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 25 Dec 2018 18:46:37 +0200 Subject: [PATCH 2/3] syncthing: move systemd files to bin output --- pkgs/applications/networking/syncthing/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 722d0695cc6..8fe9af549bf 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -63,18 +63,18 @@ in { done '' + lib.optionalString (stdenv.isLinux) '' - mkdir -p $out/lib/systemd/{system,user} + mkdir -p $bin/lib/systemd/{system,user} substitute etc/linux-systemd/system/syncthing-resume.service \ - $out/lib/systemd/system/syncthing-resume.service \ + $bin/lib/systemd/system/syncthing-resume.service \ --replace /usr/bin/pkill ${procps}/bin/pkill substitute etc/linux-systemd/system/syncthing@.service \ - $out/lib/systemd/system/syncthing@.service \ + $bin/lib/systemd/system/syncthing@.service \ --replace /usr/bin/syncthing $bin/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ - $out/lib/systemd/user/syncthing.service \ + $bin/lib/systemd/user/syncthing.service \ --replace /usr/bin/syncthing $bin/bin/syncthing ''; }; From 6642f3f213a059a830538af8e03c80c7ca386280 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 25 Dec 2018 18:47:14 +0200 Subject: [PATCH 3/3] nixos/syncthing: setup user only on system service --- nixos/modules/services/networking/syncthing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index b2ef1885a95..702481ec517 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -122,7 +122,7 @@ in { systemd.packages = [ pkgs.syncthing ]; - users = mkIf (cfg.user == defaultUser) { + users = mkIf (cfg.systemService && cfg.user == defaultUser) { users."${defaultUser}" = { group = cfg.group; home = cfg.dataDir;