Skip to content

Commit

Permalink
Merge pull request #317860 from NixOS/backport-314050-to-release-24.05
Browse files Browse the repository at this point in the history
[Backport release-24.05]  prosody: point prosodyctl by default to correct directories, remove wrapper
  • Loading branch information
SuperSandro2000 authored Jun 8, 2024
2 parents 489f4bc + f2a6d8a commit f9b0d00
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions pkgs/servers/xmpp/prosody/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
'';

Expand Down

0 comments on commit f9b0d00

Please sign in to comment.