Merge pull request #32949 from fgaz/megaglest-update
megaglest: 3.9.2 -> 3.13.0
This commit is contained in:
commit
640aa8b33f
@ -1,12 +1,13 @@
|
|||||||
{ stdenv, fetchgit, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc
|
{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc
|
||||||
, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
|
, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
|
||||||
, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib
|
, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib
|
||||||
|
, fetchFromGitHub
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "3.9.2";
|
version = "3.13.0";
|
||||||
lib-env = buildEnv {
|
lib-env = buildEnv {
|
||||||
name = "megaglest-lib-env";
|
name = "megaglest-lib-env";
|
||||||
paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
|
paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
|
||||||
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
|
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
|
||||||
stdenv.cc.cc glew mesa_glu wxGTK ];
|
stdenv.cc.cc glew mesa_glu wxGTK ];
|
||||||
};
|
};
|
||||||
@ -18,18 +19,24 @@ in
|
|||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "megaglest-${version}";
|
name = "megaglest-${version}";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchFromGitHub {
|
||||||
url = "git://github.com/MegaGlest/megaglest-source";
|
owner = "MegaGlest";
|
||||||
rev = "refs/tags/${version}";
|
repo = "megaglest-source";
|
||||||
sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv";
|
rev = "${version}";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ cmake git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK
|
buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK
|
||||||
glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ];
|
glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON
|
cmake -DCMAKE_INSTALL_PREFIX=$out \
|
||||||
|
-DBUILD_MEGAGLEST=On \
|
||||||
|
-DBUILD_MEGAGLEST_MAP_EDITOR=On \
|
||||||
|
-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On \
|
||||||
|
-DBUILD_MEGAGLEST_MODEL_VIEWER=On
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user