diff options
| author | arcnmx <arcnmx@users.noreply.github.com> | 2022-02-20 09:47:28 -0800 |
|---|---|---|
| committer | arcnmx <arcnmx@users.noreply.github.com> | 2022-02-20 09:47:28 -0800 |
| commit | 6799a9184336146467eb71298d6b18ba7f45e0dc (patch) | |
| tree | 50b9b9d77d9c93736601cf1b63ada725ab0f5dda /pkgs/servers/xmpp | |
| parent | 48036743de02692980aa6163110ea2169751e217 (diff) | |
Revert "prosody: work around makeWrapper bug"
This reverts commit 16d0b4a69f94adb523da8732b231b0d1738bd713.
Diffstat (limited to 'pkgs/servers/xmpp')
| -rw-r--r-- | pkgs/servers/xmpp/prosody/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 5d0ed06b5ae07..74cabc63ebb2c 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -74,17 +74,17 @@ stdenv.mkDerivation rec { cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))} wrapProgram $out/bin/prosody \ - --set LUA_PATH "$luaEnvPath" \ - --set LUA_CPATH "$luaEnvCPath" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" wrapProgram $out/bin/prosodyctl \ --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ - --set LUA_PATH "$luaEnvPath" \ - --set LUA_CPATH "$luaEnvCPath" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" make -C tools/migration install wrapProgram $out/bin/prosody-migrator \ - --set LUA_PATH "$luaEnvPath" \ - --set LUA_CPATH "$luaEnvCPath" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" ''; passthru = { |