megaglest: 3.9.2 -> 3.13.0

This commit is contained in:
Francesco Gazzetta 2018-01-04 13:43:35 +00:00
parent 484c24b324
commit c400bb9fb8

View File

@ -1,13 +1,13 @@
{ stdenv, 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 , 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 ];
}; };
@ -24,11 +24,11 @@ stdenv.mkDerivation {
repo = "megaglest-source"; repo = "megaglest-source";
rev = "${version}"; rev = "${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv"; 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 = ''