public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14696 from avnik/fixes

Browse Source 
minetest: Fix finding gettext by CMake
This commit is contained in:
Nikolay Amiantov 2016-04-14 21:11:25 +04:00
commit 6c13d6b402
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/games/minetest/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit, freetype , libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit, freetype
, gettext , gettext, doxygen
}: }:
let let
@ -25,13 +25,14 @@ in stdenv.mkDerivation {
cmakeFlags = [ cmakeFlags = [
"-DENABLE_FREETYPE=1" "-DENABLE_FREETYPE=1"
"-DENABLE_GETTEXT=1" "-DENABLE_GETTEXT=1"
"-DGETTEXT_INCLUDE_DIR=${gettext}/include/gettext"
"-DCURL_INCLUDE_DIR=${curl.dev}/include/curl" "-DCURL_INCLUDE_DIR=${curl.dev}/include/curl"
"-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
]; ];
buildInputs = [ buildInputs = [
cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa
openal libvorbis xlibsWrapper sqlite luajit freetype gettext openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen
]; ];
postInstall = '' postInstall = ''