lol

Support LuaJIT usage when building love2d

+23 -3
+21 -2
pkgs/development/interpreters/love/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig 2 - , SDL, mesa, openal, lua5 2 + , SDL, mesa, openal, lua 3 3 , libdevil, freetype, physfs 4 4 , libmodplug, mpg123, libvorbis, libogg 5 5 }: ··· 12 12 }; 13 13 14 14 buildInputs = [ 15 - pkgconfig SDL mesa openal lua5 15 + pkgconfig SDL mesa openal lua 16 16 libdevil freetype physfs libmodplug mpg123 libvorbis libogg 17 17 ]; 18 + 19 + preConfigure = '' 20 + luaoptions="${"''"} lua luajit " 21 + for i in lua luajit-; do 22 + for j in 5 5.0 5.1 5.2 5.3 5.4; do 23 + luaoptions="$luaoptions $i$j " 24 + done 25 + done 26 + luaso="$(echo "${lua}/lib/"lib*.so.*)" 27 + luaso="''${luaso##*/lib}" 28 + luaso="''${luaso%%.so*}" 29 + luaoptions="$luaoptions $luaso" 30 + sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure 31 + 32 + luaincdir="$(echo "${lua}/include"/*/ )" 33 + test -d "$luaincdir" && { 34 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir" 35 + } || true 36 + ''; 18 37 19 38 NIX_CFLAGS_COMPILE = '' 20 39 -I${SDL}/include/SDL
+2 -1
pkgs/top-level/all-packages.nix
··· 3192 3192 3193 3193 kona = callPackage ../development/interpreters/kona {}; 3194 3194 3195 - love = callPackage ../development/interpreters/love {}; 3195 + love = callPackage ../development/interpreters/love {lua=lua5;}; 3196 + love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; 3196 3197 3197 3198 lua4 = callPackage ../development/interpreters/lua-4 { }; 3198 3199 lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { };