diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-08-16 13:01:57 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-08-16 19:15:36 +0000 |
| commit | 2a186797673b22df3d863375987c982165b0ad7a (patch) | |
| tree | 300e76273b77c8257ed0d3f7c9411ae2fcf04b7a | |
| parent | matrix-synapse: fix homeserver script (diff) | |
| download | nixpkgs-2a186797673b22df3d863375987c982165b0ad7a.tar.gz | |
Revert "matrix-synapse: fix homeserver script"
This reverts commit 4444860f074e4530c25217a528748786f9334308.
(cherry picked from commit 21eb8c5b37c6bcc18ecd2ebaeaf4a4fabe9c0f36)
| -rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/servers/matrix-synapse/homeserver-script.patch | 23 |
2 files changed, 28 insertions, 13 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f98220d5d304..d27079399d9c 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 + |