minetest: update 0.4.4 -> 0.4.12

This commit is contained in:
C0DEHERO 2015-05-16 22:58:37 -04:00 committed by Jascha Geerds
parent 3a966376bf
commit b549ce1ddd

View File

@ -1,18 +1,18 @@
{ stdenv, fetchgit, cmake, irrlicht3843, libpng, bzip2, { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }: , libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite }:
let let
version = "0.4.4"; version = "0.4.12";
sources = { sources = {
src = fetchgit { src = fetchgit {
url = "https://github.com/celeron55/minetest.git"; url = "https://github.com/minetest/minetest.git";
rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8"; rev = "7993a403f2c17a215e4895ba1848aaf69bb61980";
sha256 = "033gajwxgs8dqxb8684waaav28s0qd6cd4rlzfldwgdbkwam9cb1"; sha256 = "04v6fd9r9by8g47xbjzkhkgac5zpik01idngbbx2in4fxrg3ac7c";
}; };
data = fetchgit { data = fetchgit {
url = "https://github.com/celeron55/minetest_game.git"; url = "https://github.com/minetest/minetest_game.git";
rev = "3928eccf74af0288d12ffb14f8222fae479bc06b"; rev = "03c00a831d5c2fd37096449bee49557879068af1";
sha256 = "1gw2267bnqwfpnm7iq014y1vkb1v3nhpg1dmg9vgm9z5yja2blif"; sha256 = "1qqhlfz296rmi3mmlvq1rwv7hq5w964w1scry095xaih7y11ycmk";
}; };
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -21,12 +21,12 @@ in stdenv.mkDerivation {
src = sources.src; src = sources.src;
cmakeFlags = [ cmakeFlags = [
"-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht" "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
]; ];
buildInputs = [ buildInputs = [
cmake irrlicht3843 libpng bzip2 libjpeg cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp
libXxf86vm mesa openal libvorbis x11 libXxf86vm mesa openal libvorbis x11 sqlite
]; ];
postInstall = '' postInstall = ''
@ -34,9 +34,11 @@ in stdenv.mkDerivation {
cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/
''; '';
meta = { meta = with stdenv.lib; {
homepage = "http://minetest.net/"; homepage = http://minetest.net/;
description = "Infinite-world block sandbox game"; description = "Infinite-world block sandbox game";
license = stdenv.lib.licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ jgeerds ];
}; };
} }