diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-06-07 01:43:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 01:43:58 +0200 |
| commit | dd443d2d10ff7f7f7451f5bd04268f21daceb74d (patch) | |
| tree | aad048f41dad11544f780ae194422e67538cfd70 /pkgs/servers/xmpp | |
| parent | f25aab11459d434ba91c7c13295425dca4b3260f (diff) | |
| parent | 59530dbdbce1133173e8e1c18bec7b9572629dd2 (diff) | |
Merge pull request #314050 from SuperSandro2000/prosody-config
prosody: point prosodyctl by default to correct directories, remove wrapper
Diffstat (limited to 'pkgs/servers/xmpp')
| -rw-r--r-- | pkgs/servers/xmpp/prosody/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 513cd5f1574b7..c9e606c5128bd 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -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 ''; |