diff options
author | Nadrieril <nadrieril@gmail.com> | 2017-08-07 23:45:25 +0100 |
---|---|---|
committer | Nadrieril <nadrieril@gmail.com> | 2017-08-12 14:08:25 +0100 |
commit | d6c1d2f793473d25838433cc882753982067496b (patch) | |
tree | 827de709fe4ac583e217f6ad54e08e8323eb5f89 /nixos/modules/services/networking/firefox/sync-server.nix | |
parent | e619ace733fee725da5a1b84e5cce68d610ba35e (diff) | |
download | nixpkgs-d6c1d2f793473d25838433cc882753982067496b.tar nixpkgs-d6c1d2f793473d25838433cc882753982067496b.tar.gz nixpkgs-d6c1d2f793473d25838433cc882753982067496b.tar.bz2 nixpkgs-d6c1d2f793473d25838433cc882753982067496b.tar.lz nixpkgs-d6c1d2f793473d25838433cc882753982067496b.tar.xz nixpkgs-d6c1d2f793473d25838433cc882753982067496b.tar.zst nixpkgs-d6c1d2f793473d25838433cc882753982067496b.zip |
firefox syncserver service: fix PYTHONPATH
Diffstat (limited to 'nixos/modules/services/networking/firefox/sync-server.nix')
-rw-r--r-- | nixos/modules/services/networking/firefox/sync-server.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 3a95b9c4ec9..c1a14931429 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -119,12 +119,13 @@ in config = mkIf cfg.enable { - systemd.services.syncserver = { + 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.pythonPackages.pasteScript pkgs.coreutils ]; - environment.PYTHONPATH = "${pkgs.pythonPackages.syncserver}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages"; + path = [ pkgs.coreutils syncServerEnv ]; preStart = '' if ! test -e ${cfg.privateConfig}; then umask u=rwx,g=x,o=x @@ -133,7 +134,7 @@ in echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')" fi ''; - serviceConfig.ExecStart = "${pkgs.pythonPackages.pasteScript}/bin/paster serve ${syncServerIni}"; + serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}"; }; }; |