Merge pull request #28188 from Nadrieril/ffsync-fix-pythonpath

firefox syncserver service: fix PYTHONPATH

Changed files
+5 -4
nixos
modules
services
networking
firefox
+5 -4
nixos/modules/services/networking/firefox/sync-server.nix
···
config = mkIf cfg.enable {
-
systemd.services.syncserver = {
after = [ "network.target" ];
description = "Firefox Sync Server";
wantedBy = [ "multi-user.target" ];
-
path = [ pkgs.pythonPackages.pasteScript pkgs.coreutils ];
-
environment.PYTHONPATH = "${pkgs.pythonPackages.syncserver}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages";
preStart = ''
if ! test -e ${cfg.privateConfig}; then
umask u=rwx,g=x,o=x
···
echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
fi
'';
-
serviceConfig.ExecStart = "${pkgs.pythonPackages.pasteScript}/bin/paster serve ${syncServerIni}";
};
};
···
config = mkIf cfg.enable {
+
systemd.services.syncserver = let
+
syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]);
+
in {
after = [ "network.target" ];
description = "Firefox Sync Server";
wantedBy = [ "multi-user.target" ];
+
path = [ pkgs.coreutils syncServerEnv ];
preStart = ''
if ! test -e ${cfg.privateConfig}; then
umask u=rwx,g=x,o=x
···
echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
fi
'';
+
serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}";
};
};