mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Revert "matrix-synapse: fix homeserver script"
This reverts commit 4444860f07
.
This commit is contained in:
parent
4444860f07
commit
21eb8c5b37
@ -19,6 +19,11 @@ buildPythonApplication rec {
|
|||||||
sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU=";
|
sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# adds an entry point for the service
|
||||||
|
./homeserver-script.patch
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [ openssl ];
|
buildInputs = [ openssl ];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
@ -65,19 +70,6 @@ buildPythonApplication rec {
|
|||||||
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
|
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.tests = { inherit (nixosTests) matrix-synapse; };
|
||||||
passthru.plugins = plugins;
|
passthru.plugins = plugins;
|
||||||
passthru.tools = tools;
|
passthru.tools = tools;
|
||||||
|
23
pkgs/servers/matrix-synapse/homeserver-script.patch
Normal file
23
pkgs/servers/matrix-synapse/homeserver-script.patch
Normal 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
|
||||||
|
|
Loading…
Reference in New Issue
Block a user