Author: viric
Date: Fri Feb 24 22:56:53 2012
New Revision: 32553
URL: https://nixos.org/websvn/nix/?rev=32553&sc=1
Log:
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.
Added:
nixpkgs/trunk/pkgs/games/rigsofrods/paths.patch
Modified:
nixpkgs/trunk/pkgs/games/rigsofrods/default.nix
Modified: nixpkgs/trunk/pkgs/games/rigsofrods/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/games/rigsofrods/default.nix Fri Feb 24 22:49:41
2012 (r32552)
+++ nixpkgs/trunk/pkgs/games/rigsofrods/default.nix Fri Feb 24 22:56:53
2012 (r32553)
@@ -1,5 +1,5 @@
{ 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
}:
@@ -20,7 +20,6 @@
enableParallelBuilding = true;
cmakeFlags = [
- # "-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a"
"-DROR_USE_CURL=TRUE"
"-DROR_USE_MYGUI=TRUE"
"-DROR_USE_OPNEAL=TRUE"
@@ -29,34 +28,24 @@
"-DROR_USE_ANGELSCRIPT=TRUE"
"-DROR_USE_SOCKETW=TRUE"
];
- makeFlags = "VERBOSE=1";
installPhase = ''
sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i
../tools/linux/binaries/plugins.cfg
ensureDir $out/share/rigsofrods
- cp -r .. $out/share/rigsofrods/build-dir
- cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods/build-dir/bin
+ cp -r ../bin/* $out/share/rigsofrods
+ cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods
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
- mkdir contentpack
- cd contentpack
+ mkdir packs
+ cd packs
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 ];
-
- preConfigure = ''
- export NIX_LDFLAGS="$NIX_LDFLAGS -langelscript -lgtk-x11-2.0"
- sed -e 's@wxLOCALE_CONV_ENCODING@0@g' -i
source/configurator/configurator.cpp
- '';
+ patches = [ ./doubleslash.patch ./paths.patch ];
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 ];
meta = {
Added: nixpkgs/trunk/pkgs/games/rigsofrods/paths.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/games/rigsofrods/paths.patch Fri Feb 24 22:56:53
2012 (r32553)
@@ -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);
+
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
