From 2c93fd9691a566711e71b94c1bb127a2070ad208 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 5 Apr 2018 13:13:23 +0200
Subject: poke prosody

---
 customized/prosody.nix | 6 ++++--
 ymir.nix               | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/customized/prosody.nix b/customized/prosody.nix
index d8afe5b9..87f88f4b 100644
--- a/customized/prosody.nix
+++ b/customized/prosody.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg
 , lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null
 , withLibevent ? true, withZlib ? true
-, communityModules ? [], extraLibs ? [], extraModules ? []
+, withCommunityModules ? [], extraLibs ? [], extraModules ? []
 }:
 
 assert withLibevent -> luaevent != null;
@@ -21,7 +21,7 @@ let
   copyExtraModule  = path: "n=0; for i in ${path}/*; do n=1; done; if [[ $n -gt 0 ]]; then cp -rv ${path}/* $out/lib/prosody/modules/; fi";
   luaPath          = concatStringsSep ";" (map getLuaPath  libs);
   luaCPath         = concatStringsSep ";" (map getLuaCPath libs);
-  copyModules      = concatStringsSep ";" (map copyModule  communityModules);
+  copyModules      = concatStringsSep ";" (map copyModule  withCommunityModules);
   copyExtraModules = concatStringsSep ";" (map copyExtraModule extraModules);
 in
 
@@ -62,6 +62,8 @@ stdenv.mkDerivation rec {
         --set LUA_CPATH '${luaCPath};'
     '';
 
+  passthru.communityModules = withCommunityModules;
+
   meta = {
     description = "Open-source XMPP application server written in Lua";
     license = licenses.mit;
diff --git a/ymir.nix b/ymir.nix
index 14d9b36c..c2b61efe 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -65,7 +65,7 @@ in rec {
       prosody = pkgs.callPackage ./customized/prosody.nix ({
           inherit (pkgs.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luazlib luasec;
           lua5 = pkgs.lua5_1;
-          communityModules = ["mod_carbons" "mod_reload_modules" "mod_csi" "mod_cloud_notify" "mod_csi_pump" "mod_smacks" "mod_track_muc_joins" "mod_watchuntrusted"];
+          withCommunityModules = ["mod_carbons" "mod_reload_modules" "mod_csi" "mod_cloud_notify" "mod_csi_pump" "mod_smacks" "mod_track_muc_joins" "mod_watchuntrusted"];
           extraModules = [prosodyAuth];
           extraLibs = [luaPam luaPosix luaSha2];
         });
-- 
cgit v1.2.3