From 11cb4d06801ae3fb59d5345288abbab2c2cd95a2 Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Tue, 3 Aug 2021 09:44:06 -0600
Subject: [PATCH] matrix-synapse: fix homeserver script

(cherry picked from commit 4444860f074e4530c25217a528748786f9334308)
---
 pkgs/servers/matrix-synapse/default.nix       | 18 +++++++++++----
 .../matrix-synapse/homeserver-script.patch    | 23 -------------------
 2 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/servers/matrix-synapse/homeserver-script.patch

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index d27079399d9..f98220d5d30 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -19,11 +19,6 @@ buildPythonApplication rec {
     sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU=";
   };
 
-  patches = [
-    # adds an entry point for the service
-    ./homeserver-script.patch
-  ];
-
   buildInputs = [ openssl ];
 
   propagatedBuildInputs = [
@@ -70,6 +65,19 @@ buildPythonApplication rec {
     PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
   '';
 
+  postFixup = ''
+    mkdir -p $out/bin
+
+    # Make a little wrapper for running Synapse with its dependencies
+    echo "#!/bin/sh
+      exec python -m synapse.app.homeserver \"\$@\"
+    " > $out/bin/homeserver
+    chmod +x $out/bin/homeserver
+    wrapProgram $out/bin/homeserver \
+      --set PATH ${python3}/bin \
+      --set PYTHONPATH $PYTHONPATH
+  '';
+
   passthru.tests = { inherit (nixosTests) matrix-synapse; };
   passthru.plugins = plugins;
   passthru.tools = tools;
diff --git a/pkgs/servers/matrix-synapse/homeserver-script.patch b/pkgs/servers/matrix-synapse/homeserver-script.patch
deleted file mode 100644
index 554a2c5f66c..00000000000
--- a/pkgs/servers/matrix-synapse/homeserver-script.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/homeserver b/homeserver
-new file mode 120000
-index 000000000..2f1d41351
---- /dev/null
-+++ b/homeserver
-@@ -0,0 +1 @@
-+synapse/app/homeserver.py
-\ No newline at end of file
-diff --git a/setup.py b/setup.py
-index 5ce06c898..f1ccd95bc 100755
---- a/setup.py
-+++ b/setup.py
-@@ -115,6 +115,6 @@ setup(
-         "Programming Language :: Python :: 3.6",
-         "Programming Language :: Python :: 3.7",
-     ],
--    scripts=["synctl"] + glob.glob("scripts/*"),
-+    scripts=["synctl", "homeserver"] + glob.glob("scripts/*"),
-     cmdclass={"test": TestCommand},
- )
--- 
-2.22.0
-