dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "prosody: work around makeWrapper bug"

Browse Source 
This reverts commit 16d0b4a69f.
This commit is contained in:
arcnmx 2022-02-20 09:47:28 -08:00
parent 48036743de
commit 6799a91843
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/xmpp/prosody/default.nix
View File

@ -74,17 +74,17 @@ stdenv.mkDerivation rec {
cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
'') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))} '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))}
wrapProgram $out/bin/prosody \ wrapProgram $out/bin/prosody \
--set LUA_PATH "$luaEnvPath" \ --prefix LUA_PATH ';' "$luaEnvPath" \
--set LUA_CPATH "$luaEnvCPath" --prefix LUA_CPATH ';' "$luaEnvCPath"
wrapProgram $out/bin/prosodyctl \ wrapProgram $out/bin/prosodyctl \
--add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \
--set LUA_PATH "$luaEnvPath" \ --prefix LUA_PATH ';' "$luaEnvPath" \
--set LUA_CPATH "$luaEnvCPath" --prefix LUA_CPATH ';' "$luaEnvCPath"
make -C tools/migration install make -C tools/migration install
wrapProgram $out/bin/prosody-migrator \ wrapProgram $out/bin/prosody-migrator \
--set LUA_PATH "$luaEnvPath" \ --prefix LUA_PATH ';' "$luaEnvPath" \
--set LUA_CPATH "$luaEnvCPath" --prefix LUA_CPATH ';' "$luaEnvCPath"
''; '';
passthru = { passthru = {