Revert "matrix-synapse: fix homeserver script"

This reverts commit 4444860f07.
This commit is contained in:
Maximilian Bosch 2021-08-16 13:01:57 +02:00
parent 4444860f07
commit 21eb8c5b37
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 28 additions and 13 deletions

View File

@ -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;

View File

@ -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