diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-08-30 12:12:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 12:12:45 +0800 |
| commit | 250735e07efcf240c083928af3b227bffccf8de3 (patch) | |
| tree | 5261608f0c7d4cc003a4bc409c54d2f2085f18d2 /pkgs/games | |
| parent | fc726e34948e35c47053514dab437b644fe9e047 (diff) | |
| parent | bf03e96426ea3b39a02afb7a65623d0f603bd58b (diff) | |
Merge pull request #96650 from peterhoeg/u/gemrb_0_8_7
gemrb: 0.8.6 -> 0.8.7
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/gemrb/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 4f7d1cb37503f..91b841f6c51b6 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -4,24 +4,27 @@ stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { - owner = "gemrb"; - repo = "gemrb"; - rev = "v${version}"; - sha256 = "0vsr3fsqmv9b7s5l0cwhpq2pf7ah2wvgmcn9y8asj6w8hprp17d4"; + owner = "gemrb"; + repo = "gemrb"; + rev = "v${version}"; + 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 ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - + # TODO: add proper OpenGL support. We are currently (0.8.7) getting a shader + # error on execution when enabled. cmakeFlags = [ "-DLAYOUT=opt" + # "-DOPENGL_BACKEND=GLES" + # "-DOpenGL_GL_PREFERENCE=GLVND" ]; meta = with stdenv.lib; { |