From 1a5c12c34cae877b053ddddff291995839ea832f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 13 Feb 2012 13:41:57 +0000 Subject: [PATCH] I made stuntrally work, thanks to adding the nvidia_cg_toolkit to ogre. svn path=/nixpkgs/trunk/; revision=32257 --- pkgs/development/libraries/ogre/default.nix | 1 + pkgs/games/stuntrally/default.nix | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 90604ed1058..e7744f43e12 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -5,6 +5,7 @@ x@{builderDefsPackage , xproto, libX11, libXmu, libSM, pkgconfig , libXxf86vm, xf86vidmodeproto, libICE , renderproto, libXrender + , nvidia_cg_toolkit , ...}: builderDefsPackage (a : diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 14db3dd52b8..69609b1bbfb 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,6 +1,5 @@ -{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig }: - -throw "Stunt Rally needs ogre with cg support at runtime - we have to package nvidia cg" +{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig +, makeWrapper }: stdenv.mkDerivation rec { name = "stunt-rally-1.4"; @@ -10,7 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq"; }; - buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig ]; + buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig makeWrapper ]; + + # 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. + postInstall = '' + wrapProgram $out/bin/stuntrally --set OGRE_PLUGIN_DIR ${ogre}/lib/OGRE + wrapProgram $out/bin/sr-editor --set OGRE_PLUGIN_DIR ${ogre}/lib/OGRE + ''; enableParallelBuilding = true;