diff options
Diffstat (limited to 'pkgs/servers/xmpp/prosody/default.nix')
-rw-r--r-- | pkgs/servers/xmpp/prosody/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 2f237c1f2277f..c9e606c5128bd 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "b109773ce6fe"; - hash = "sha256-N1vmShDWtWsHD4b1x7UjX6Sj28iPaDeCLSYeDOLLhzo="; + rev = "d3a72777f149"; + hash = "sha256-qLuhEdvtOMfu78oxLUZKWZDb/AME1+IRnk0jkQNxTU8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -64,13 +64,17 @@ stdenv.mkDerivation rec { make -C tools/migration ''; + buildFlags = [ + # don't search for configs in the nix store when running prosodyctl + "INSTALLEDCONFIG=/etc/prosody" + "INSTALLEDDATA=/var/lib/prosody" + ]; + # the wrapping should go away once lua hook is fixed postInstall = '' ${concatMapStringsSep "\n" (module: '' cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))} - wrapProgram $out/bin/prosodyctl \ - --add-flags '--config "/etc/prosody/prosody.cfg.lua"' make -C tools/migration install ''; |