ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

luajit.pkgs.luaexpat: fix redefinition of luaL_setfuncs()

Browse Source
This commit is contained in:
Luka Blaskovic 2020-08-09 07:26:07 +00:00
parent 3fcd7415a7
commit 7c365103d7
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/development/lua-modules/luaexpat.patch Normal file
View File

@ -0,0 +1,36 @@
diff --git a/src/lxplib.c b/src/lxplib.c
index 1c972db..5712611 100644
--- a/src/lxplib.c
+++ b/src/lxplib.c
@@ -590,7 +590,7 @@ static void set_info (lua_State *L) {
/*
** Adapted from Lua 5.2.0
*/
-static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
+static void compat_luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
luaL_checkstack(L, nup, "too many upvalues");
for (; l->name != NULL; l++) { /* fill the table with given functions */
int i;
@@ -602,6 +602,8 @@ static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
}
lua_pop(L, nup); /* remove upvalues */
}
+#else
+#define compat_luaL_setfuncs(L, reg, nup) luaL_setfuncs(L, reg, nup)
#endif
@@ -612,11 +614,11 @@ int luaopen_lxp (lua_State *L) {
lua_pushvalue(L, -2);
lua_rawset(L, -3);
- luaL_setfuncs (L, lxp_meths, 0);
+ compat_luaL_setfuncs (L, lxp_meths, 0);
lua_pop (L, 1); /* remove metatable */
lua_newtable (L);
- luaL_setfuncs (L, lxp_funcs, 0);
+ compat_luaL_setfuncs (L, lxp_funcs, 0);
set_info (L);
return 1;
}

3
pkgs/development/lua-modules/overrides.nix
View File

@ -204,6 +204,9 @@ with super;
externalDeps = [
{ name = "EXPAT"; dep = pkgs.expat; }
];
patches = [
./luaexpat.patch
];
});
# TODO Somehow automatically amend buildInputs for things that need luaffi