diff options
| author | arcnmx <arcnmx@users.noreply.github.com> | 2022-02-11 14:29:43 -0800 |
|---|---|---|
| committer | arcnmx <arcnmx@users.noreply.github.com> | 2022-02-11 14:45:22 -0800 |
| commit | 0c1cf5c7b44ccc3e29c321a607cc00669a51a0a3 (patch) | |
| tree | ede5618b9a67471860ea8c12bf38625ae7508fd5 /pkgs/servers/xmpp | |
| parent | 10747dda2326cc9e7befcde6e670981d52638dd9 (diff) | |
prosody: set lua env in wrapper
This seems to be fallout from #136615
Diffstat (limited to 'pkgs/servers/xmpp')
| -rw-r--r-- | pkgs/servers/xmpp/prosody/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 1e60f430586f1..341e2b251cb30 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -63,23 +63,26 @@ stdenv.mkDerivation rec { make -C tools/migration ''; + luaEnvPath = lua.pkgs.lib.genLuaPathAbsStr luaEnv; + luaEnvCPath = lua.pkgs.lib.genLuaCPathAbsStr luaEnv; + # 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/prosody \ - --prefix LUA_PATH ';' "$LUA_PATH" \ - --prefix LUA_CPATH ';' "$LUA_CPATH" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" wrapProgram $out/bin/prosodyctl \ --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ - --prefix LUA_PATH ';' "$LUA_PATH" \ - --prefix LUA_CPATH ';' "$LUA_CPATH" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" make -C tools/migration install wrapProgram $out/bin/prosody-migrator \ - --prefix LUA_PATH ';' "$LUA_PATH" \ - --prefix LUA_CPATH ';' "$LUA_CPATH" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" ''; passthru = { |