diff options
| author | Robert Scott <code@humanleg.org.uk> | 2015-02-28 22:37:16 +0000 |
|---|---|---|
| committer | Robert Scott <code@humanleg.org.uk> | 2015-02-28 22:37:16 +0000 |
| commit | 7476de722b30e917e40aec3abfa9aa2fa2cea5d7 (patch) | |
| tree | f4b78748ac18fed5526a30c9b4a721a2fc60e49d /pkgs/development/libraries/luabind | |
| parent | 4147050550367c9aa64a04e94f9d2b8b4a67f492 (diff) | |
luabind: add patch to allow us to discover a provided luajit
Diffstat (limited to 'pkgs/development/libraries/luabind')
| -rw-r--r-- | pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch | 22 | ||||
| -rw-r--r-- | pkgs/development/libraries/luabind/default.nix | 2 |
2 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch b/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch new file mode 100644 index 000000000000..6e5fe6aa6f82 --- /dev/null +++ b/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch @@ -0,0 +1,22 @@ +diff --git a/Jamroot b/Jamroot +index 94494bf..83dfcbb 100755 +--- a/Jamroot ++++ b/Jamroot +@@ -64,7 +64,7 @@ else if [ os.name ] in LINUX MACOSX FREEBSD + $(LUA_PATH) $(HOME)/Library/Frameworks /Library/Frameworks /usr /usr/local /opt/local /opt ; + + local possible-suffixes = +- include/lua5.1 include/lua51 include/lua include ; ++ include/lua5.1 include/lua51 include/lua include include/luajit-2.0 ; + + local includes = [ GLOB $(possible-prefixes)/$(possible-suffixes) : lua.h ] ; + +@@ -83,7 +83,7 @@ else if [ os.name ] in LINUX MACOSX FREEBSD + + local lib = $(prefix)/lib ; + +- local names = liblua5.1 liblua51 liblua ; ++ local names = liblua5.1 liblua51 liblua libluajit-5.1 ; + local extensions = .a .so ; + + library = [ GLOB $(lib)/lua51 $(lib)/lua5.1 $(lib)/lua $(lib) : diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index d89229541cdd..5afbb71ab65b 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d"; }; - patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ]; + patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ]; buildInputs = [ boost-build lua boost ]; |