mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 17:03:01 +00:00
luajit.pkgs.luaexpat: fix redefinition of luaL_setfuncs()
This commit is contained in:
parent
3fcd7415a7
commit
7c365103d7
36
pkgs/development/lua-modules/luaexpat.patch
Normal file
36
pkgs/development/lua-modules/luaexpat.patch
Normal 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;
|
||||
}
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user