From 0c978d7d4f7626d1998f413cce1d3ee2f7b4320b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 13 Apr 2016 04:35:23 +0300 Subject: [PATCH] openmw: build with its own openscenegraph fork This gives speed improvement and fixes potential bugs. For example: https://bugs.openmw.org/issues/3351 Updating our openscenegraph package would fix this too, but it breaks some packages (i.e. simgear, bumping the version does not help). Besides, fork has patches for better performance. --- pkgs/games/openmw/default.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 3c396472eed3..2fdd2c7e56cc 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,6 +1,20 @@ -{ stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal, pkgconfig }: +{ stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal +, giflib, pkgconfig }: -stdenv.mkDerivation rec { +let + openscenegraph_ = openscenegraph.override { + inherit ffmpeg giflib; + withApps = false; + }; + openscenegraph__ = openscenegraph_.overrideDerivation (self: { + src = fetchFromGitHub { + owner = "OpenMW"; + repo = "osg"; + rev = "a72f43de6e1e4a8191643acb26c3e7138f833798"; + sha256 = "04x2pjfrdz1kaj4i34zpzrmkk018jnr84rb6z646cz5fin3dapyh"; + }; + }); +in stdenv.mkDerivation rec { version = "0.38.0"; name = "openmw-${version}"; @@ -13,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph SDL2 unshield openal pkgconfig ]; + buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph__ SDL2 unshield openal pkgconfig ]; meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind";