Making rigs of rods build and run right away. Simpyl run 'rorconfig' first, and

'RoR' then. On linux, disable Caleum rendering. It does not work. Known bug
upstream.


svn path=/nixpkgs/trunk/; revision=32553
This commit is contained in:
Lluís Batlle i Rossell 2012-02-24 22:56:53 +00:00
parent 60bd341efd
commit 6f7cb59e04
2 changed files with 20 additions and 19 deletions

View File

@ -1,5 +1,5 @@
{ fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost, { fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost,
pkgconfig, libuuid, lua5, openal, ogre, ois, curl, gtk, pixman, mygui, unzip, pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
angelscript, caelum, ogrepaged, mysocketw, libxcb angelscript, caelum, ogrepaged, mysocketw, libxcb
}: }:
@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = [ cmakeFlags = [
# "-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a"
"-DROR_USE_CURL=TRUE" "-DROR_USE_CURL=TRUE"
"-DROR_USE_MYGUI=TRUE" "-DROR_USE_MYGUI=TRUE"
"-DROR_USE_OPNEAL=TRUE" "-DROR_USE_OPNEAL=TRUE"
@ -29,34 +28,24 @@ stdenv.mkDerivation rec {
"-DROR_USE_ANGELSCRIPT=TRUE" "-DROR_USE_ANGELSCRIPT=TRUE"
"-DROR_USE_SOCKETW=TRUE" "-DROR_USE_SOCKETW=TRUE"
]; ];
makeFlags = "VERBOSE=1";
installPhase = '' installPhase = ''
sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
ensureDir $out/share/rigsofrods ensureDir $out/share/rigsofrods
cp -r .. $out/share/rigsofrods/build-dir cp -r ../bin/* $out/share/rigsofrods
cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods/build-dir/bin cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods
ensureDir $out/bin ensureDir $out/bin
ln -s $out/share/rigsofrods/build-dir/bin/{RoR,rorconfig} $out/bin ln -s $out/share/rigsofrods/{RoR,rorconfig} $out/bin
cd $out/share/rigsofrods cd $out/share/rigsofrods
mkdir contentpack mkdir packs
cd contentpack cd packs
unzip "${contentPackSrc}" unzip "${contentPackSrc}"
echo First run rorconfig once to create ~/.rigsofrods
echo Then copy $out/share/rigsofrods/build-dir/bin/plugins.cfg to ~/.rigsofrods
echo Then ln $out/share/rigsofrods/contentpack/* to ~/.rigsofrods/packs
''; '';
patches = [ ./doubleslash.patch ]; patches = [ ./doubleslash.patch ./paths.patch ];
preConfigure = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -langelscript -lgtk-x11-2.0"
sed -e 's@wxLOCALE_CONV_ENCODING@0@g' -i source/configurator/configurator.cpp
'';
buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig
libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript libuuid openal ogre ois curl gtk mygui unzip angelscript
caelum ogrepaged mysocketw libxcb ]; caelum ogrepaged mysocketw libxcb ];
meta = { meta = {

View File

@ -0,0 +1,12 @@
diff --git a/source/main/framework/ContentManager.cpp b/source/main/framework/ContentManager.cpp
index 0bfea8c..82cdab9 100644
--- a/source/main/framework/ContentManager.cpp
+++ b/source/main/framework/ContentManager.cpp
@@ -238,6 +238,7 @@ bool ContentManager::init(void)
#endif // USE_OPENAL
// and the content
+ ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("Program Path")+"packs", "FileSystem", "Packs", true);
ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"packs", "FileSystem", "Packs", true);
ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"mods", "FileSystem", "Packs", true);