From cb15d762f4984d09ff7b5c1716d3660a51e1509a Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Sat, 23 Feb 2019 20:58:28 +0100
Subject: [PATCH] Revert "nixos/matrix-synapse: use python to launch synapse"

This reverts commit eb753318b3716921d3ab3b1887385a5ee92b1884.

The homeserver script has been restored with commit
0c663e90326fa7d81a36643f9e43b8574939fea3.
---
 nixos/modules/services/misc/matrix-synapse.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index a01e34d7362..87999c3614f 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -651,16 +651,12 @@ in {
 
     services.postgresql.enable = mkIf usePostgresql (mkDefault true);
 
-    systemd.services.matrix-synapse =
-    let
-      python = (pkgs.python3.withPackages (ps: with ps; [ (ps.toPythonModule cfg.package) ]));
-    in
-    {
+    systemd.services.matrix-synapse = {
       description = "Synapse Matrix homeserver";
       after = [ "network.target" "postgresql.service" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
-        ${python.interpreter} -m synapse.app.homeserver \
+        ${cfg.package}/bin/homeserver \
           --config-path ${configFile} \
           --keys-directory ${cfg.dataDir} \
           --generate-keys
@@ -691,7 +687,7 @@ in {
         WorkingDirectory = cfg.dataDir;
         PermissionsStartOnly = true;
         ExecStart = ''
-          ${python.interpreter} -m synapse.app.homeserver \
+          ${cfg.package}/bin/homeserver \
             ${ concatMapStringsSep "\n  " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
             --keys-directory ${cfg.dataDir}
         '';