git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #96650 from peterhoeg/u/gemrb_0_8_7

gemrb: 0.8.6 -> 0.8.7

commit250735e07efcf240c083928af3b227bffccf8de3 authorPeter Hoeg <peter@hoeg.com> dateSun 30 Aug 2020, 12:12 (6 years ago) parentfc726e3bf03e96
1 file changed+11−8
pkgs/games/gemrb/default.nix+11−8
pkgs/games/gemrb/default.nix+11−8
@@ -4,24 +4,27 @@
44
55stdenv.mkDerivation rec {
66 pname = "gemrb";
7− version = "0.8.6";
7+ version = "0.8.7";
88
99 src = fetchFromGitHub {
10− owner = "gemrb";
11− repo = "gemrb";
12− rev = "v${version}";
13− sha256 = "0vsr3fsqmv9b7s5l0cwhpq2pf7ah2wvgmcn9y8asj6w8hprp17d4";
10+ owner = "gemrb";
11+ repo = "gemrb";
12+ rev = "v${version}";
13+ sha256 = "14j9mhrbi4gnrbv25nlsvcxzkylijzrnwbqqnrg7pr452lb3srpb";
1414 };
1515
16− # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional
16+ # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl
17+ # reqs) optional
1718 buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ];
1819
1920 nativeBuildInputs = [ cmake ];
2021
21− enableParallelBuilding = true;
22−
22+ # TODO: add proper OpenGL support. We are currently (0.8.7) getting a shader
23+ # error on execution when enabled.
2324 cmakeFlags = [
2425 "-DLAYOUT=opt"
26+ # "-DOPENGL_BACKEND=GLES"
27+ # "-DOpenGL_GL_PREFERENCE=GLVND"
2528 ];
2629
2730 meta = with stdenv.lib; {