diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index d1de1854c938..ebf5d19d6817 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -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: '' diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 0d55f5e31b70..d89920e7ef5f 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -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 ]; } );