From 6f224e65ea99481dec08c03bcbd4d237391c988f Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sat, 9 Aug 2025 23:57:50 +0200
Subject: [PATCH 1/2] jitsi-meet: fix infinite recursion with prosody package

---
 nixos/modules/services/web-apps/jitsi-meet.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ];
         }
       );

From 804919a7f4a119af2c7ba45d19bdb687f7b69b6c Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 10 Aug 2025 01:03:49 +0200
Subject: [PATCH 2/2] nixos/prosody: fix serialization error if httpFileShare
 is null

---
 nixos/modules/services/networking/prosody.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

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: ''