Merge pull request #14696 from avnik/fixes

minetest: Fix finding gettext by CMake

+3 -2
+3 -2
pkgs/games/minetest/default.nix
··· 1 { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp 2 , libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit, freetype 3 - , gettext 4 }: 5 6 let ··· 25 cmakeFlags = [ 26 "-DENABLE_FREETYPE=1" 27 "-DENABLE_GETTEXT=1" 28 "-DCURL_INCLUDE_DIR=${curl.dev}/include/curl" 29 "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" 30 ]; 31 32 buildInputs = [ 33 cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa 34 - openal libvorbis xlibsWrapper sqlite luajit freetype gettext 35 ]; 36 37 postInstall = ''
··· 1 { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp 2 , libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit, freetype 3 + , gettext, doxygen 4 }: 5 6 let ··· 25 cmakeFlags = [ 26 "-DENABLE_FREETYPE=1" 27 "-DENABLE_GETTEXT=1" 28 + "-DGETTEXT_INCLUDE_DIR=${gettext}/include/gettext" 29 "-DCURL_INCLUDE_DIR=${curl.dev}/include/curl" 30 "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" 31 ]; 32 33 buildInputs = [ 34 cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa 35 + openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen 36 ]; 37 38 postInstall = ''