diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2019-01-25 22:56:55 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2019-01-25 22:56:55 -0500 |
| commit | 9e3db4df2c434ce5390c7dde47f2b606e724cbbd (patch) | |
| tree | 2ea28b9c6e83b415e90ed5db18105f6a091bf7a0 /pkgs | |
| parent | c3e995fa737e4cb70b779130036a73e68dd52968 (diff) | |
| download | nixpkgs-9e3db4df2c434ce5390c7dde47f2b606e724cbbd.tar nixpkgs-9e3db4df2c434ce5390c7dde47f2b606e724cbbd.tar.gz nixpkgs-9e3db4df2c434ce5390c7dde47f2b606e724cbbd.tar.bz2 nixpkgs-9e3db4df2c434ce5390c7dde47f2b606e724cbbd.tar.lz nixpkgs-9e3db4df2c434ce5390c7dde47f2b606e724cbbd.tar.xz nixpkgs-9e3db4df2c434ce5390c7dde47f2b606e724cbbd.tar.zst nixpkgs-9e3db4df2c434ce5390c7dde47f2b606e724cbbd.zip | |
toluapp: Fix includes for newer Lua versions
See https://github.com/LuaDist/toluapp/pull/2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/toluapp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/toluapp/headers.patch | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 5ad9a7c58ef..90d36c71caa 100644 --- 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 \ diff --git a/pkgs/development/tools/toluapp/headers.patch b/pkgs/development/tools/toluapp/headers.patch new file mode 100644 index 00000000000..59a47bb989a --- /dev/null +++ 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 + { |