gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jitsi-meet: fix infinite recursion with prosody package (#432371)

Browse Source
This commit is contained in:
lassulus
2025-08-10 09:34:49 +02:00
committed by GitHub
parent 9a00fd8993 804919a7f4
commit cb771a25a1
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/networking/prosody.nix
+7 -11
View File
@@ -585,18 +585,14 @@ let
${muc.extraConfig}
'') cfg.muc}
${
lib.optionalString (cfg.httpFileShare != null) ''
Component ${toLua cfg.httpFileShare.domain} "http_file_share"
modules_disabled = { "s2s" }
''
+ lib.optionalString (cfg.httpFileShare.http_host != null) ''
${lib.optionalString (cfg.httpFileShare != null) ''
Component ${toLua cfg.httpFileShare.domain} "http_file_share"
modules_disabled = { "s2s" }
${lib.optionalString (cfg.httpFileShare.http_host != null) ''
http_host = "${cfg.httpFileShare.http_host}"
''
+ ''
${settingsToLua " http_file_share_" (cfg.httpFileShare // { domain = null; })}
''
}
''}
${settingsToLua " http_file_share_" (cfg.httpFileShare // { domain = null; })}
''}
${lib.concatStringsSep "\n" (
lib.mapAttrsToList (n: v: ''
nixos/modules/services/web-apps/jitsi-meet.nix
+1 -1
View File
@@ -235,7 +235,7 @@ in
# required for muc_breakout_rooms
package = lib.mkDefault (
config.services.prosody.package.override {
pkgs.prosody.override {
withExtraLuaPackages = p: with p; [ cjson ];
}
);