Merge pull request #96650 from peterhoeg/u/gemrb_0_8_7

gemrb: 0.8.6 -> 0.8.7
This commit is contained in:
Peter Hoeg 2020-08-30 12:12:45 +08:00 committed by GitHub
commit 250735e07e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,24 +4,27 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gemrb"; pname = "gemrb";
version = "0.8.6"; version = "0.8.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gemrb"; owner = "gemrb";
repo = "gemrb"; repo = "gemrb";
rev = "v${version}"; rev = "v${version}";
sha256 = "0vsr3fsqmv9b7s5l0cwhpq2pf7ah2wvgmcn9y8asj6w8hprp17d4"; sha256 = "14j9mhrbi4gnrbv25nlsvcxzkylijzrnwbqqnrg7pr452lb3srpb";
}; };
# TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl
# reqs) optional
buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ]; buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
enableParallelBuilding = true; # TODO: add proper OpenGL support. We are currently (0.8.7) getting a shader
# error on execution when enabled.
cmakeFlags = [ cmakeFlags = [
"-DLAYOUT=opt" "-DLAYOUT=opt"
# "-DOPENGL_BACKEND=GLES"
# "-DOpenGL_GL_PREFERENCE=GLVND"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {