Author: viric
Date: Wed Mar 30 22:08:33 2011
New Revision: 26618
URL: https://svn.nixos.org/websvn/nix/?rev=26618&sc=1
Log:
Adding Rigs of Rods.
Basically it builds, but I still don't know how to run it. I imagine the
installPhase is still too poor, but it's better than nothing.
I also added two mygui versions. That stable, and that required by Rigs of
Roads (svn).
Added:
nixpkgs/trunk/pkgs/development/libraries/mygui/
nixpkgs/trunk/pkgs/development/libraries/mygui/default.nix
nixpkgs/trunk/pkgs/development/libraries/mygui/svn.nix
nixpkgs/trunk/pkgs/games/rigsofrods/
nixpkgs/trunk/pkgs/games/rigsofrods/default.nix
nixpkgs/trunk/pkgs/games/rigsofrods/wx.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/ogre/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/mygui/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/mygui/default.nix Wed Mar 30
22:08:33 2011 (r26618)
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost}:
+
+stdenv.mkDerivation rec {
+ name = "mygui-3.0.1";
+
+ src = fetchurl {
+ url = mirror://sourceforge/my-gui/MyGUI_3.0.1_source.zip;
+ sha256 = "1n56kl8ykzgv4k2nm9317jg9b9x2qa3l9hamz11hzn1qqjn2z4ig";
+ };
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ unzip ogre cmake ois freetype libuuid boost ];
+
+ meta = {
+ homepage = http://mygui.info/;
+ description = "Library for creating GUIs for games and 3D applications";
+ license = "LGPLv3+";
+ };
+}
Added: nixpkgs/trunk/pkgs/development/libraries/mygui/svn.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/mygui/svn.nix Wed Mar 30
22:08:33 2011 (r26618)
@@ -0,0 +1,27 @@
+{stdenv, fetchsvn, unzip, ogre, cmake, ois, freetype, libuuid, boost}:
+
+stdenv.mkDerivation rec {
+ name = "mygui-svn-4141";
+
+ src = fetchsvn {
+ url = https://my-gui.svn.sourceforge.net/svnroot/my-gui/trunk;
+ rev = 4141;
+ sha256 = "0xfm4b16ksqd1cwq45kl01wi4pmj244dpn11xln8ns7wz0sffjwn";
+ };
+
+ enableParallelBuilding = true;
+
+ cmakeFlags = [
+ "-DOGRE_LIB_DIR=${ogre}/lib"
+ "-DOGRE_INCLUDE_DIR=${ogre}/include/OGRE"
+ "-DOGRE_LIBRARIES=OgreMain"
+ ];
+
+ buildInputs = [ unzip ogre cmake ois freetype libuuid boost ];
+
+ meta = {
+ homepage = http://mygui.info/;
+ description = "Library for creating GUIs for games and 3D applications";
+ license = "LGPLv3+";
+ };
+}
Modified: nixpkgs/trunk/pkgs/development/libraries/ogre/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/ogre/default.nix Wed Mar 30
22:08:29 2011 (r26617)
+++ nixpkgs/trunk/pkgs/development/libraries/ogre/default.nix Wed Mar 30
22:08:33 2011 (r26618)
@@ -35,8 +35,10 @@
inherit (sourceInfo) name version;
inherit buildInputs;
+ doMyBuild = a.fullDepEntry ("make -j4") ["doCmake"];
+
/* doConfigure should be removed if not needed */
- phaseNames = ["doCmake" "doMakeInstall"];
+ phaseNames = ["doCmake" "doMyBuild" "doMakeInstall"];
meta = {
description = "A 3D engine";
Added: nixpkgs/trunk/pkgs/games/rigsofrods/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/games/rigsofrods/default.nix Wed Mar 30 22:08:33
2011 (r26618)
@@ -0,0 +1,45 @@
+{ fetchsvn, stdenv, wxGTK28, freeimage, cmake, zziplib, mesa, boost, pkgconfig,
+ libuuid, lua5, openal, ogre, ois, curl, gtk, pixman, mygui }:
+
+stdenv.mkDerivation rec {
+ version = "1780";
+ name = "rigsofroads-svn-${version}";
+
+ src = fetchsvn {
+ url = https://rigsofrods.svn.sourceforge.net/svnroot/rigsofrods/trunk;
+ rev = version;
+ sha256 = "1i557jc79jpg79kg0gk5a7zsd2m42x89v9q83kzywrzzp1x5imp3";
+ };
+
+ 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"
+ # "-DROR_USE_MOFILEREADER=TRUE"
+ # "-DROR_USE_CAELUM=TRUE"
+ # "-DROR_USE_PAGED=TRUE"
+ # "-DROR_USE_ANGELSCRIPT=TRUE"
+ # "-DROR_USE_SOCKETW=TRUE"
+ ];
+
+ installPhase = ''
+ ensureDir $out/bin
+ cp ../bin/RoR ../bin/rorconfig $out/bin
+ '';
+
+ patches = [ ./wx.patch ];
+
+ buildInputs = [ wxGTK28 freeimage cmake zziplib mesa boost pkgconfig
+ libuuid lua5 openal ogre ois curl gtk mygui ];
+
+ meta = {
+ description = "3D simulator game where you can drive, fly and sail various
vehicles";
+ homepage = http://rigsofrods.sourceforge.net/;
+ license = "GPLv3";
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
Added: nixpkgs/trunk/pkgs/games/rigsofrods/wx.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/games/rigsofrods/wx.patch Wed Mar 30 22:08:33
2011 (r26618)
@@ -0,0 +1,13 @@
+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);
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Mar 30 22:08:29
2011 (r26617)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Mar 30 22:08:33
2011 (r26618)
@@ -3841,6 +3841,10 @@
muparser = callPackage ../development/libraries/muparser { };
+ mygui = callPackage ../development/libraries/mygui {};
+
+ myguiSvn = callPackage ../development/libraries/mygui/svn.nix {};
+
ncurses = makeOverridable (import ../development/libraries/ncurses) {
inherit fetchurl stdenv;
unicode = system != "i686-cygwin";
@@ -7138,6 +7142,10 @@
racer = callPackage ../games/racer { };
+ rigsofrods = callPackage ../games/rigsofrods {
+ mygui = myguiSvn;
+ };
+
rogue = callPackage ../games/rogue { };
sauerbraten = callPackage ../games/sauerbraten {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
