From 7e1d0c12a3e9e8cc2d4a78ba9a6039c20f3eca32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 10 Jan 2013 15:10:27 +0100 Subject: [PATCH] stuntrally: updating from 1.4 to 1.8 I updated ogre and mygui, too. Now myguiSvn is older than mygui. We should check if this commit breaks other games that use ogre (ror?) --- pkgs/development/libraries/mygui/default.nix | 10 +++--- pkgs/development/libraries/ogre/default.nix | 6 ++-- pkgs/games/stuntrally/default.nix | 32 +++++++++++++++----- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index f692c14a6df..0a2df000384 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost}: +{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost, pkgconfig}: stdenv.mkDerivation rec { - name = "mygui-3.0.1"; + name = "mygui-3.2.0"; src = fetchurl { - url = mirror://sourceforge/my-gui/MyGUI_3.0.1_source.zip; - sha256 = "1n56kl8ykzgv4k2nm9317jg9b9x2qa3l9hamz11hzn1qqjn2z4ig"; + url = mirror://sourceforge/my-gui/MyGUI_3.2.0.zip; + sha256 = "16m1xrhx13qbwnp9gds2amlwycq8q5npr0665hnknwsb6rph010p"; }; enableParallelBuilding = true; - buildInputs = [ unzip ogre cmake ois freetype libuuid boost ]; + buildInputs = [ unzip ogre cmake ois freetype libuuid boost pkgconfig ]; meta = { homepage = http://mygui.info/; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 3a8e1c4ae55..6bb1916ed0f 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -8,11 +8,11 @@ , nvidia_cg_toolkit }: stdenv.mkDerivation { - name = "ogre-1.7.2"; + name = "ogre-1.8.1"; src = fetchurl { - url = "mirror://sourceforge/ogre/1.7/ogre_src_v1-7-2.tar.bz2"; - sha256 = "10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5"; + url = "mirror://sourceforge/ogre/1.8.1/ogre_src_v1-8-1.tar.bz2"; + sha256 = "1avadx87sdfdk8165wlffnd5dzks694dcdnkg3ijap966k4qm46s"; }; cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ] diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 69609b1bbfb..31fd25a5150 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,15 +1,33 @@ -{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig -, makeWrapper }: +{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL, libvorbis, pkgconfig +, makeWrapper, enet, libXcursor }: stdenv.mkDerivation rec { - name = "stunt-rally-1.4"; + name = "stunt-rally-1.8"; - src = fetchurl { - url = mirror://sourceforge/stuntrally/StuntRally-1.4-sources.tar.bz2; - sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq"; + src = fetchgit { + url = git://github.com/stuntrally/stuntrally.git; + rev = "refs/tags/1.8"; + sha256 = "0p8p83xx8q33kymsqnmxqca4jdfyg9rwrsac790z56gdbc7gnahm"; }; - buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig makeWrapper ]; + tracks = fetchgit { + url = git://github.com/stuntrally/tracks.git; + rev = "refs/tags/1.8"; + sha256 = "1gcrs21nn0v3hvhrw8dc0wh1knn5qh66cjx7a1igiciiadmi2s3l"; + }; + + patchPhase = '' + sed -i 's/materials/materials material_templates/' data/CMakeLists.txt + ''; + + preConfigure = '' + mkdir data/tracks + cp -R $tracks/* data/tracks + ''; + + buildInputs = [ cmake boost ogre mygui ois SDL libvorbis pkgconfig makeWrapper enet + libXcursor + ]; # I think they suppose cmake should give them OGRE_PLUGIN_DIR defined, but # the cmake code I saw is not ready for that. Therefore, we use the env var.