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

prosody: work around makeWrapper bug

Browse Source 
This seems to have been caused by #128503, because the values to be
prefixed contain special/wildcard characters.
This commit is contained in:
arcnmx 2022-02-11 14:30:50 -08:00
parent 0c1cf5c7b4
commit 16d0b4a69f
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

@ -72,17 +72,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 \
--prefix LUA_PATH ';' "$luaEnvPath" \ --set LUA_PATH "$luaEnvPath" \
--prefix LUA_CPATH ';' "$luaEnvCPath" --set 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"' \
--prefix LUA_PATH ';' "$luaEnvPath" \ --set LUA_PATH "$luaEnvPath" \
--prefix LUA_CPATH ';' "$luaEnvCPath" --set LUA_CPATH "$luaEnvCPath"
make -C tools/migration install make -C tools/migration install
wrapProgram $out/bin/prosody-migrator \ wrapProgram $out/bin/prosody-migrator \
--prefix LUA_PATH ';' "$luaEnvPath" \ --set LUA_PATH "$luaEnvPath" \
--prefix LUA_CPATH ';' "$luaEnvCPath" --set LUA_CPATH "$luaEnvCPath"
''; '';
passthru = { passthru = {