Skip to content

Commit 9e3db4d

Browse files
committed
toluapp: Fix includes for newer Lua versions
See LuaDist/toluapp#2
1 parent c3e995f commit 9e3db4d

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

Diff for: pkgs/development/tools/toluapp/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
1515
buildInputs = [ lua ];
1616

17-
patches = [ ./environ-and-linux-is-kinda-posix.patch ];
17+
patches = [ ./environ-and-linux-is-kinda-posix.patch ./headers.patch ];
1818

1919
preConfigure = ''
2020
substituteInPlace config_posix.py \

Diff for: pkgs/development/tools/toluapp/headers.patch

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/include/tolua++.h b/include/tolua++.h
2+
index ed53449..f57d56d 100644
3+
--- a/include/tolua++.h
4+
+++ b/include/tolua++.h
5+
@@ -43,8 +43,8 @@ extern "C" {
6+
7+
typedef int lua_Object;
8+
9+
-#include "lua.h"
10+
-#include "lauxlib.h"
11+
+#include <lua.h>
12+
+#include <lauxlib.h>
13+
14+
struct tolua_Error
15+
{

0 commit comments

Comments
 (0)