From 21eb8c5b37c6bcc18ecd2ebaeaf4a4fabe9c0f36 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 16 Aug 2021 13:01:57 +0200
Subject: [PATCH] Revert "matrix-synapse: fix homeserver script"

This reverts commit 4444860f074e4530c25217a528748786f9334308.
---
 pkgs/servers/matrix-synapse/default.nix       | 18 ++++-----------
 .../matrix-synapse/homeserver-script.patch    | 23 +++++++++++++++++++
 2 files changed, 28 insertions(+), 13 deletions(-)
 create 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 2f9ceba4f562..0b0133082ef3 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -19,6 +19,11 @@ buildPythonApplication rec {
     sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU=";
   };
 
+  patches = [
+    # adds an entry point for the service
+    ./homeserver-script.patch
+  ];
+
   buildInputs = [ openssl ];
 
   propagatedBuildInputs = [
@@ -65,19 +70,6 @@ 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
new file mode 100644
index 000000000000..554a2c5f66c1
--- /dev/null
+++ b/pkgs/servers/matrix-synapse/homeserver-script.patch
@@ -0,0 +1,23 @@
+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
+