Merge pull request #8091 from doshitan/minetest-improvements

minetest: LuaJIT, in-app mod store, better fonts and enable translations
This commit is contained in:
Arseniy Seroka 2015-05-31 20:36:47 +03:00
commit 9b47bfa5d8

View File

@ -1,5 +1,7 @@
{ stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite }: , libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite, luajit, freetype
, gettext
}:
let let
version = "0.4.12"; version = "0.4.12";
@ -21,12 +23,15 @@ in stdenv.mkDerivation {
src = sources.src; src = sources.src;
cmakeFlags = [ cmakeFlags = [
"-DENABLE_FREETYPE=1"
"-DENABLE_GETTEXT=1"
"-DCURL_INCLUDE_DIR=${curl}/include/curl"
"-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
]; ];
buildInputs = [ buildInputs = [
cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa
libXxf86vm mesa openal libvorbis x11 sqlite openal libvorbis x11 sqlite luajit freetype gettext
]; ];
postInstall = '' postInstall = ''