MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Robert Scott 2015-02-28 22:37:16 +00:00
parent 4147050550
commit 7476de722b
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch Normal file
View file

@ -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) :

2
pkgs/development/libraries/luabind/default.nix
View file

@ -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 ];

2
pkgs/top-level/all-packages.nix
View file

@ -6731,6 +6731,8 @@ let
luabind = callPackage ../development/libraries/luabind { lua = lua5_1; };
luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; };
lzo = callPackage ../development/libraries/lzo { };
matio = callPackage ../development/libraries/matio { };