lol

luabind: add patch to allow us to discover a provided luajit

+25 -1
+22
pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch
··· 1 + diff --git a/Jamroot b/Jamroot 2 + index 94494bf..83dfcbb 100755 3 + --- a/Jamroot 4 + +++ b/Jamroot 5 + @@ -64,7 +64,7 @@ else if [ os.name ] in LINUX MACOSX FREEBSD 6 + $(LUA_PATH) $(HOME)/Library/Frameworks /Library/Frameworks /usr /usr/local /opt/local /opt ; 7 + 8 + local possible-suffixes = 9 + - include/lua5.1 include/lua51 include/lua include ; 10 + + include/lua5.1 include/lua51 include/lua include include/luajit-2.0 ; 11 + 12 + local includes = [ GLOB $(possible-prefixes)/$(possible-suffixes) : lua.h ] ; 13 + 14 + @@ -83,7 +83,7 @@ else if [ os.name ] in LINUX MACOSX FREEBSD 15 + 16 + local lib = $(prefix)/lib ; 17 + 18 + - local names = liblua5.1 liblua51 liblua ; 19 + + local names = liblua5.1 liblua51 liblua libluajit-5.1 ; 20 + local extensions = .a .so ; 21 + 22 + library = [ GLOB $(lib)/lua51 $(lib)/lua5.1 $(lib)/lua $(lib) :
+1 -1
pkgs/development/libraries/luabind/default.nix
··· 8 8 sha256 = "0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d"; 9 9 }; 10 10 11 - patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ]; 11 + patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ]; 12 12 13 13 buildInputs = [ boost-build lua boost ]; 14 14
+2
pkgs/top-level/all-packages.nix
··· 6731 6731 6732 6732 luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; 6733 6733 6734 + luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; }; 6735 + 6734 6736 lzo = callPackage ../development/libraries/lzo { }; 6735 6737 6736 6738 matio = callPackage ../development/libraries/matio { };