summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Gerus <ar@is-a.cat>2021-05-24 16:38:18 +0200
committerRobert Gerus <ar@is-a.cat>2021-05-24 16:38:18 +0200
commitf7ccc5f35d0e1fe11a7e01e3dddd1ff28566ba1d (patch)
tree4482162ea03210f2ce77165d197603c96966cfaa
parent05d9b4d61965f51e9740644a3ffc6b6a0c0b2eb8 (diff)
downloadnixpkgs-f7ccc5f35d0e1fe11a7e01e3dddd1ff28566ba1d.tar
nixpkgs-f7ccc5f35d0e1fe11a7e01e3dddd1ff28566ba1d.tar.gz
nixpkgs-f7ccc5f35d0e1fe11a7e01e3dddd1ff28566ba1d.tar.bz2
nixpkgs-f7ccc5f35d0e1fe11a7e01e3dddd1ff28566ba1d.tar.lz
nixpkgs-f7ccc5f35d0e1fe11a7e01e3dddd1ff28566ba1d.tar.xz
nixpkgs-f7ccc5f35d0e1fe11a7e01e3dddd1ff28566ba1d.tar.zst
nixpkgs-f7ccc5f35d0e1fe11a7e01e3dddd1ff28566ba1d.zip
weechatScripts.weechat-matrix: fix matrix_sso_helper path
server.py tries to launch a matrix_sso_helper binary when connecting to
a homeserver that uses some SSO mechanism instead of plain login and
password, but doesn't have $out/bin in $PATH.

Using substituteInPlace to patch server.py so that the helper process is
started by using its actual filesystem location instead of relying on
$PATH.

Fixes: https://github.com/NixOS/nixpkgs/issues/124186
-rw-r--r--pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index c42fe55169e..c82fb9ca739 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -73,6 +73,7 @@ in buildPythonPackage {
   postFixup = ''
     addToSearchPath program_PYTHONPATH $out/${python.sitePackages}
     patchPythonScript $out/share/matrix.py
+    substituteInPlace $out/${python.sitePackages}/matrix/server.py --replace \"matrix_sso_helper\" \"$out/bin/matrix_sso_helper\"
   '';
 
   meta = with lib; {