From 636aa8dc98a8c81a5263533b9b7afb8d146924cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Nov 2023 23:04:22 +0100 Subject: [PATCH 1/2] prosody: point prosodyctl by default to correct directories --- pkgs/servers/xmpp/prosody/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 513cd5f1574b..4f4e349fe09c 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -64,6 +64,12 @@ 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: '' From 59530dbdbce1133173e8e1c18bec7b9572629dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Oct 2023 03:02:56 +0100 Subject: [PATCH 2/2] prosody: don't wrap prosodyctl This overwrites the PROSODY_CONFIG and breaks other --config args --- pkgs/servers/xmpp/prosody/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 4f4e349fe09c..c9e606c5128b 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -75,8 +75,6 @@ stdenv.mkDerivation rec { ${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 '';