Unverified Commit a309ddb4 authored by Alexander Bantyev's avatar Alexander Bantyev Committed by GitHub
Browse files

Merge pull request #268544 from Red-Teapot/luabind_luajit-fix 

luabind_luajit: Fix build on all platforms
parents 7ce67836 68e012e4

pkgs/development/libraries/luabind/0.9.1-discover-luajit.patch

0 → 100644
+22 −0
Original line number Diff line number Diff line 
diff --git a/cmake/Modules/FindLua52.cmake b/cmake/Modules/FindLua52.cmake

index f4398e4..17377c0 100644

--- a/cmake/Modules/FindLua52.cmake

+++ b/cmake/Modules/FindLua52.cmake

@@ -61,7 +61,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h

 )

 

 FIND_LIBRARY(_LUA_LIBRARY_RELEASE

-  NAMES lua52 lua5.2 lua-5.2 lua

+  NAMES lua52 lua5.2 lua-5.2 lua luajit-5.1

   HINTS

   $ENV{LUA_DIR}

   PATH_SUFFIXES lib64 lib

@@ -75,7 +75,7 @@ FIND_LIBRARY(_LUA_LIBRARY_RELEASE

 )

 

 FIND_LIBRARY(_LUA_LIBRARY_DEBUG

-  NAMES lua52-d lua5.2-d lua-5.2-d lua-d

+  NAMES lua52-d lua5.2-d lua-5.2-d lua-d luajit-5.1-d

   HINTS

   $ENV{LUA_DIR}

   PATH_SUFFIXES lib64 lib

pkgs/development/libraries/luabind/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ stdenv.mkDerivation rec { 
    inherit lua;

  };



  patches = [./0.9.1-discover-luajit.patch];



  meta = {

    homepage = "https://github.com/luabind/luabind";

    homepage = "https://github.com/Oberon00/luabind";

    description = "A library that helps you create bindings between C++ and Lua";

    license = lib.licenses.mit;

    platforms = lib.platforms.unix;