Updating and fixing rigsofrods, to 0.39.4. Pay attention to the last 'echo' of installPhase.

svn path=/nixpkgs/trunk/; revision=32550
This commit is contained in:
Lluís Batlle i Rossell 2012-02-24 22:05:47 +00:00
parent d6f6caea6b
commit d3d5783466
2 changed files with 24 additions and 44 deletions

View file

@ -1,21 +1,15 @@
{ fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost,
pkgconfig, libuuid, lua5, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
angelscript
angelscript, caelum, ogrepaged, mysocketw, libxcb
}:
stdenv.mkDerivation rec {
/* version = "1780"; */
version = "0.37";
version = "0.39.4";
name = "rigsofrods-${version}";
/* src = fetchsvn {
url = https://rigsofrods.svn.sourceforge.net/svnroot/rigsofrods/trunk;
rev = version;
}; */
src = fetchurl {
url = mirror://sourceforge/rigsofrods/rigsofrods/0.37-dev/RoR-0.37.126-Sources.zip;
sha256 = "03mxmxpfdlsri0j3nqgyj2pc4gpzs8zq8qgg6qhnyazi7j95j4mk";
url = mirror://sourceforge/rigsofrods/rigsofrods-source-0.39.4.tar.bz2;
sha256 = "1kpjkski0yllwzdki0rjpqvifjs0fwpgs513y4dv4s9wfwan1qcx";
};
contentPackSrc = fetchurl {
@ -26,45 +20,44 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags = [
"-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a"
# "-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a"
"-DROR_USE_CURL=TRUE"
"-DROR_USE_MYGUI=TRUE"
# "-DROR_USE_OPNEAL=TRUE"
# "-DROR_USE_MOFILEREADER=TRUE"
# "-DROR_USE_CAELUM=TRUE"
# "-DROR_USE_PAGED=TRUE"
"-DROR_USE_OPNEAL=TRUE"
"-DROR_USE_CAELUM=TRUE"
"-DROR_USE_PAGED=TRUE"
"-DROR_USE_ANGELSCRIPT=TRUE"
# "-DROR_USE_SOCKETW=TRUE"
"-DROR_USE_SOCKETW=TRUE"
];
makeFlags = "VERBOSE=1";
installPhase = ''
sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../bin/plugins.cfg
sed -e "/CgProgramManager/d" -i ../bin/plugins.cfg
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
ensureDir $out/bin
for i in RoR rorconfig RoRViewer; do
echo '#! ${stdenv.shell}' >> "$out/bin/$i"
if [ "$i" = "rorconfig" ]; then
echo "[ -d \"\$HOME/.rigsofrods\" ] && cp -r '$out/share/rigsofrods/build-dirs/bin/skeleton' \"\$HOME/.rigsofrods\"" >> "$out/bin/$i"
echo "chmod u+w -R \"\$HOME/.rigsofrods\"" >> "$out/bin/$i"
fi
echo "\"$out/share/rigsofrods/build-dir/bin/$i\"" >> "$out/bin/$i"
chmod a+x "$out/bin/$i"
done
cd $out/share/rigsofrods/build-dir/bin/
ln -s $out/share/rigsofrods/build-dir/bin/{RoR,rorconfig} $out/bin
cd $out/share/rigsofrods
mkdir contentpack
cd contentpack
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 = [ ./wx.patch ];
buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig
libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript ];
libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript
caelum ogrepaged mysocketw libxcb ];
meta = {
description = "3D simulator game where you can drive, fly and sail various vehicles";

View file

@ -1,13 +0,0 @@
diff --git a/source/configurator/configurator.cpp b/source/configurator/configurator.cpp
index c058820..5a4b316 100644
--- a/source/configurator/configurator.cpp
+++ b/source/configurator/configurator.cpp
@@ -2155,7 +2155,7 @@ void MyDialog::OnsightrangesliderScroll(wxScrollEvent &e)
int v = sightRange->GetValue();
if(v == sightRange->GetMax())
{
- s = "Unlimited";
+ s = _("Unlimited");
} else
{
s.Printf(wxT("%i m"), v);