Merge 'master' into staging

(relatively simple conflicts)

9 files changed, 96 insertions, 37 deletions

diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix
new file mode 100644
index 000000000000..a729a5b014f3
--- /dev/null
+++ b/pkgs/games/bastet/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, ncurses, boost }:
+
+stdenv.mkDerivation rec {
+  name = "bastet-${version}";
+  version = "0.43.1";
+  buildInputs = [ ncurses boost ];
+
+  src = fetchFromGitHub {
+    owner = "fph";
+    repo = "bastet";
+    rev = version;
+    sha256 = "14ymdarx30zqxyixvb17h4hs57y6zfx0lrdvc200crllz8zzdx5z";
+  };
+
+  installPhase = ''
+    mkdir -p "$out"/bin
+    cp bastet "$out"/bin/
+    mkdir -p "$out"/share/man/man6
+    cp bastet.6 "$out"/share/man/man6
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tetris clone with 'bastard' block-choosing AI";
+    homepage = http://fph.altervista.org/prog/bastet.html;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.dezgeg ];
+  };
+}
diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix
index 34094b637fce..2048dffb54b5 100644
--- a/pkgs/games/mars/default.nix
+++ b/pkgs/games/mars/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl, cmake, mesa, sfml_git, fribidi, taglib }:
+{ stdenv, fetchgit, cmake, mesa, sfml, fribidi, taglib }:
 stdenv.mkDerivation rec {
-  name = "mars-${version}";
-  version = "0.7.2";
-  src = fetchurl {
-    url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz";
-    sha256 = "092y0y1dghkvs0syjg9cv8iq0w29hkin8bznqc8sqm21v0swk451";
+  name = "mars-${version}-${rev}";
+  version = "0.7.5";
+  rev = "c855d04409";
+  src = fetchgit {
+    url = "https://github.com/thelaui/M.A.R.S..git";
+    inherit rev;
+    sha256 = "70fc4b5823f2efb03e0bcd3fe82dee88ee93ddfd81d53de0d7eb3fe02793d65e";
   };
-  buildInputs = [ cmake mesa sfml_git fribidi taglib ];
+  buildInputs = [ cmake mesa sfml fribidi taglib ];
+  patches = [ ./unbind_fix.patch ];
   installPhase = ''
     cd ..
     find -name '*.svn' -exec rm -rf {} \;
diff --git a/pkgs/games/mars/unbind_fix.patch b/pkgs/games/mars/unbind_fix.patch
new file mode 100644
index 000000000000..2aef6eb5cf66
--- /dev/null
+++ b/pkgs/games/mars/unbind_fix.patch
@@ -0,0 +1,19 @@
+diff --git a/src/System/window.cpp b/src/System/window.cpp
+index e9a099a..e3f6de9 100644
+--- a/src/System/window.cpp
++++ b/src/System/window.cpp
+@@ -308,12 +308,12 @@ namespace window {
+         glEnable(GL_TEXTURE_2D);
+ 
+         if (shader)
+-            shader->bind();
++            sf::Shader::bind(shader);
+ 
+         window_.draw(toBeDrawn, states);
+ 
+         if (shader)
+-            shader->unbind();
++            sf::Shader::bind(NULL);
+ 
+         window_.popGLStates();
+         glPopMatrix();
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 0a444cf61b44..b8e5c6467584 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -73,5 +73,5 @@ buildFHSUserEnv {
     export LD_PRELOAD=/lib32/libpulse.so:/lib64/libpulse.so:/lib32/libasound.so:/lib64/libasound.so
   '';
 
-  runScript = "exec steam";
+  runScript = "steam";
 }
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 2379ac9ecd4e..82cffc8dec6f 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -1,26 +1,35 @@
-{ stdenv, fetchhg, zlib, bzip2, pkgconfig, alsaLib, pulseaudio, libmad, libtheora,
-  libvorbis, libpng, libjpeg, mesa, gtk, ffmpeg, automake, autoconf, glew }:
+{ fetchFromGitHub, stdenv, pkgconfig, autoconf, automake, yasm, zlib, bzip2, alsaLib
+, pulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk
+, mesa, glew }:
 
 stdenv.mkDerivation rec {
-  name = "stepmania-5";
+  name = "stepmania-${version}";
+  version = "5.0.7";
 
-  src = fetchhg {
-    url = "https://code.google.com/p/sm-ssc/";
-    # revision = "5fdf515a180e";
-    sha256 = "05v19giq7d956islr2r8350zfwc4h8sq89xlj93ccii8rp94cvvf";
+  src = fetchFromGitHub {
+    owner = "stepmania";
+    repo  = "stepmania";
+    rev   = "v${version}";
+    sha256 = "1lagnk8x72v5jazcbb39237fi33kp5zgg22fxw7zmvr4qwqiqbz9";
   };
 
-  buildInputs = [ zlib bzip2 pkgconfig alsaLib pulseaudio libmad libtheora
-                  libvorbis libpng libjpeg mesa gtk ffmpeg automake autoconf glew ];
+  buildInputs = [
+    pkgconfig autoconf automake yasm zlib bzip2 alsaLib pulseaudio libmad libtheora
+    libvorbis libpng libjpeg gtk mesa glew
+  ];
+
+  preConfigure = ''
+    substituteInPlace autoconf/m4/video.m4 \
+      --replace './configure $FFMPEG_CONFFLAGS' './configure --prefix='$out' $FFMPEG_CONFFLAGS'
+
+    ./autogen.sh
+  '';
 
-  preConfigure = "./autogen.sh";
   postInstall = ''
-    mv "$out/stepmania 5/"* $out/
-    rmdir "$out/stepmania 5"
     mkdir -p $out/bin
-    echo "#\!/bin/sh" > $out/bin/stepmania
-    echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${alsaLib}/lib' >> $out/bin/stepmania
-    echo "exec $out/stepmania" >> $out/bin/stepmania
+    echo "#!/bin/sh" > $out/bin/stepmania
+    echo "export LD_LIBRARY_PATH=$out/stepmania-5.0:${alsaLib}/lib:\$LD_LIBRARY_PATH" >> $out/bin/stepmania
+    echo "exec $out/stepmania-5.0/stepmania" >> $out/bin/stepmania
     chmod +x $out/bin/stepmania
   '';
 
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 3aa23ffd0e8c..21e6a28cf857 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.76";
+  name = "tibia-10.77";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1076.tgz;
-    sha256 = "1kzsbrravk8lmpirghhsynnygmcig8jkbw6qfzk1fkabi1d02yrv";
+    url = http://static.tibia.com/download/tibia1077.tgz;
+    sha256 = "1qz2a25irzhdwh4swwcfz4g37f1j3cxhm9c43yl763bvc718ikly";
   };
 
   shell = stdenv.shell;
diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix
index a5ae8ec8b6de..ad65b54ddcda 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-rally-0.6.0";
+  name = "trigger-rally-0.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/trigger-rally/${name}-src.tar.bz2";
-    sha256 = "0qm6anlcqx19iaiz0zh0bf74g9nc6gr8cy0lbsxahwgzkwsqz0fw";
+    sha256 = "1fvb6dl5bwclmx0y8ygyrfn8jczc5kxawxlyv6mp592smb5x5hjs";
   };
 
   srcData = fetchurl {
-    url = "mirror://sourceforge/trigger-rally/trigger-rally-0.6.0-data.tar.bz2";
-    sha256 = "161mfgv68my2231d8ps4zs1axisrj0lkcc4yqsr0x28w0mr19j4y";
+    url = "mirror://sourceforge/trigger-rally/${name}-data.tar.bz2";
+    sha256 = "04f9d74gz5xvfx6pnmbfxqhp0kd1p16j5lrgcq12wxvla6py4qaw";
   };
 
   buildInputs = [ SDL freealut SDL_image openal physfs zlib mesa jam ];
 
   preConfigure = ''
-    configureFlags="$configureFlags --datadir=$out/share/trigger-rally-0.6.0-data"
+    configureFlags="$configureFlags --datadir=$out/share/${name}-data"
   '';
 
   # It has some problems installing the README file, so... out.
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 9db82d722d27..ba8245bb7006 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -8,11 +8,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xonotic-0.7.0";
+  name = "xonotic-0.8.0";
 
   src = fetchurl {
     url = "http://dl.xonotic.org/${name}.zip";
-    sha256 = "21a5fb5493c269cd3843789cb8598f952d4196e8bc71804b9bd5808b646542c6";
+    sha256 = "0w336750sq8nwqljlcj3znk4iaj3nvn6id144d7j72vsh84ci1qa";
   };
 
   buildInputs = [
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index 0d55f1cd13e0..9975aa1b15b7 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer,
-  mysql, makeWrapper }:
+{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
+, libmysql, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "zod-engine-2011-03-18";
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
     sourceRoot=`pwd`/src
   '';
 
-  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.lib
+  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql
     makeWrapper ];
 
-  NIX_LDFLAGS="-L${mysql.lib}/lib/mysql";
+  NIX_LDFLAGS="-L${libmysql}/lib/mysql";
 
   installPhase = ''
     mkdir -p $out/bin $out/share/zod