svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32231

4 files changed, 69 insertions, 11 deletions

diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index c34160976e31..7609f3abda5a 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -1,15 +1,15 @@
-{ cabal, binary, ConfigFile, gtk, MissingH, mtl, random, zlib }:
+{ cabal, binary, ConfigFile, gtk, mtl, random, zlib }:
 
 cabal.mkDerivation (self: {
   pname = "LambdaHack";
-  version = "0.1.20110918";
-  sha256 = "14zn650x7r65lb76hygz6yiwzbg2rbcyisi7kx2lszrbg0fp8pa9";
-  isLibrary = false;
+  version = "0.2.0";
+  sha256 = "09lgbpwrlw29n797q3k5aafvkg04nd8cw6pi41g914phf7lxzq4c";
+  isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary ConfigFile gtk MissingH mtl random zlib ];
+  buildDepends = [ binary ConfigFile gtk mtl random zlib ];
   meta = {
     homepage = "http://github.com/kosmikus/LambdaHack";
-    description = "A roguelike game engine in early development";
+    description = "A roguelike game engine in early and very active development";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix
new file mode 100644
index 000000000000..252f881c3752
--- /dev/null
+++ b/pkgs/games/bitsnbots/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, SDL, lua, mesa }:
+
+stdenv.mkDerivation rec {
+  name = "bitsnbots-20111230";
+
+  src = fetchurl {
+    url = http://moikmellah.org/downloads/bitsnbots/bitsnbots.source.tgz;
+    sha256 = "1iiclm6bfpp2p6d692hpnw25xyr48ki1xkcxa7fvh5b7m1519gsp";
+  };
+
+  patchPhase = ''
+    sed -i '/^INCLUDE/d' Makefile.linux
+  '';
+
+  makefile = "Makefile.linux";
+
+  NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
+
+  NIX_LDFLAGS = "-lGL";
+
+  installPhase = ''
+    mkdir -p $out/share/${name}
+    cp -R bitsnbots resource scripts README $out/share/${name}
+    mkdir -p $out/bin
+    ln -s $out/share/${name}/bitsnbots $out/bin
+  '';
+
+  buildInputs = [ SDL lua mesa ];
+
+  meta = {
+    description = "Simple puzzle game with moving robots";
+    homepage = "http://moikmellah.org/blog/?page_id=19";
+    license = "GPLv3+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
new file mode 100644
index 000000000000..14db3dd52b80
--- /dev/null
+++ b/pkgs/games/stuntrally/default.nix
@@ -0,0 +1,22 @@
+{ 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"
+
+stdenv.mkDerivation rec {
+  name = "stunt-rally-1.4";
+
+  src = fetchurl {
+    url = mirror://sourceforge/stuntrally/StuntRally-1.4-sources.tar.bz2;
+    sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq";
+  };
+
+  buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Stunt Rally game with Track Editor, based on VDrift and OGRE";
+    homepage = http://code.google.com/p/vdrift-ogre/;
+    license = "GPLv3+";
+  };
+}
diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix
index fca8ddb889a2..2a25c290b2d8 100644
--- a/pkgs/games/trigger/default.nix
+++ b/pkgs/games/trigger/default.nix
@@ -1,22 +1,22 @@
 { fetchurl, stdenv, SDL, freealut, SDL_image, openal, physfs, zlib, mesa, jam }:
 
 stdenv.mkDerivation rec {
-  name = "trigger-0.5.2.1";
+  name = "trigger-rally-0.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/trigger-rally/${name}-src.tar.bz2";
-    sha256 = "17sbw6j2z62w047fb8vlkabhq7s512r3a4pjd6402lpq09mpywhg";
+    sha256 = "0qm6anlcqx19iaiz0zh0bf74g9nc6gr8cy0lbsxahwgzkwsqz0fw";
   };
 
   srcData = fetchurl {
-    url = "mirror://sourceforge/trigger-rally/trigger-0.5.2-data.tar.bz2";
-    sha256 = "0sxfpn2vqzgv1dm66j75bmfc1kmnwrv1bb1yazmm803nnngk6zy9";
+    url = "mirror://sourceforge/trigger-rally/trigger-rally-0.6.0-data.tar.bz2";
+    sha256 = "161mfgv68my2231d8ps4zs1axisrj0lkcc4yqsr0x28w0mr19j4y";
   };
 
   buildInputs = [ SDL freealut SDL_image openal physfs zlib mesa jam ];
 
   preConfigure = ''
-    configureFlags="$configureFlags --datadir=$out/share/trigger-0.5.2-data"
+    configureFlags="$configureFlags --datadir=$out/share/trigger-rally-0.6.0-data"
   '';
 
   # It has some problems installing the README file, so... out.