toluapp: Fix includes for newer Lua versions

See https://github.com/LuaDist/toluapp/pull/2
2019-01-25 22:56:55 -05:00 · 2019-01-25 22:56:55 -05:00 · 9e3db4df2c
commit 9e3db4df2c
parent c3e995fa73
2 changed files with 16 additions and 1 deletions
--- a/pkgs/development/tools/toluapp/default.nix
+++ b/pkgs/development/tools/toluapp/default.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
  buildInputs = [ lua ];

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

  preConfigure = ''
    substituteInPlace config_posix.py \
--- a/pkgs/development/tools/toluapp/headers.patch
+++ b/pkgs/development/tools/toluapp/headers.patch
@ -0,0 +1,15 @@
+diff --git a/include/tolua++.h b/include/tolua++.h
+index ed53449..f57d56d 100644
+--- a/include/tolua++.h
+++ b/include/tolua++.h
+@@ -43,8 +43,8 @@ extern "C" {
+
+ typedef int lua_Object;
+
+-#include "lua.h"
+-#include "lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
+
+ struct tolua_Error
+ {