Merge branch 'master' into x-updates

Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix

6 files changed, 26 insertions, 11 deletions

diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix
index aa7d2f1e9144..856d9afe0f92 100644
--- a/pkgs/games/alienarena/default.nix
+++ b/pkgs/games/alienarena/default.nix
@@ -1,17 +1,22 @@
 { stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg
 , libvorbis, freetype, openal, mesa }:
+
 stdenv.mkDerivation rec {
   name = "alienarena-7.52";
+
   src = fetchurl {
     url = "http://icculus.org/alienarena/Files/alienarena-7_52-linux20110929.tar.gz";
     sha256 = "1s1l3apxsxnd8lyi568y38a1fcdr0gwmc3lkgq2nkc676k4gki3m";
   };
+
   buildInputs = [ pkgconfig libjpeg libX11 curl libogg libvorbis
                   freetype openal mesa libXxf86vm ];
+
   patchPhase = ''
     substituteInPlace ./configure \
       --replace libopenal.so.1 ${openal}/lib/libopenal.so.1
   '';
+
   meta = {
     description = "A free, stand-alone first-person shooter computer game";
     longDescription = ''
@@ -27,6 +32,6 @@ stdenv.mkDerivation rec {
     # Engine is under GPLv2, everything else is under
     license = [ "unfree-redistributable" ];
     maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    #platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix
index e14b9b26a4f0..e920b8c633e0 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/pkgs/games/speed-dreams/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     homepage = http://speed-dreams.sourceforge.net/;
     license = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [viric raskin];
-    platforms = with stdenv.lib.platforms; linux;
+    #platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix
index 80f3d72c579a..d9955aec3eb4 100644
--- a/pkgs/games/ufoai/default.nix
+++ b/pkgs/games/ufoai/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     description = "A squad-based tactical strategy game in the tradition of X-Com";
     license = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    #platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index 63a8f5086845..97bd1ab432d9 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = http://vdrift.net/;
     license = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    #platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index a21911f4067d..21870fc3777c 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -5,11 +5,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="xboard";
-    version="4.7.0";
+    version="4.7.1";
     name="${baseName}-${version}";
-    hash="15azbnyfapjppfni9k99sk68af1kg60nnh95rz8jgb3i2xv5y5m7";
-    url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.0.tar.gz";
-    sha256="15azbnyfapjppfni9k99sk68af1kg60nnh95rz8jgb3i2xv5y5m7";
+    hash="0hnav2swswaf0463c4wnmgwaif3g42f2a1mqyqc5fa1py32iy6ry";
+    url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.1.tar.gz";
+    sha256="0hnav2swswaf0463c4wnmgwaif3g42f2a1mqyqc5fa1py32iy6ry";
   };
   buildInputs = [
     libX11 xproto libXt libXaw libSM libICE libXmu 
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 3553649dccb8..957d7b2c7f45 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -1,29 +1,37 @@
 { stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }:
+
 stdenv.mkDerivation rec {
   name = "xonotic-0.5.0";
+
   src = fetchurl {
     url = "http://dl.xonotic.org/${name}.zip";
     sha256 = "03vkbddffnz6ws3gkwc3qvi6icfsyiqq0dqw2vw5hj2kidm25rsq";
   };
+
   # Commented out things needed to build cl-release because of errors.
   #buildInputs = [ libX11 libXpm libXext xf86dgaproto libXxf86dga libXxf86vm mesa ];
   buildInputs = [ unzip SDL libjpeg ];
+
   sourceRoot = "Xonotic/source/darkplaces";
+
   #patchPhase = ''
   #  substituteInPlace glquake.h \
   #    --replace 'typedef char GLchar;' '/*typedef char GLchar;*/'
   #'';
-  NIX_LDFLAGS="
+
+  NIX_LDFLAGS = ''
     -rpath ${zlib}/lib
     -rpath ${libvorbis}/lib
     -rpath ${curl}/lib
-  ";
+  '';
+
   buildPhase = ''
     DP_FS_BASEDIR="$out/share/xonotic"
     #make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release
     make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release
     make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release
   '';
+
   installPhase = ''
     mkdir -p "$out/bin"
     cp darkplaces-dedicated "$out/bin/xonotic-dedicated"
@@ -32,7 +40,9 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/share/xonotic"
     mv data "$out/share/xonotic"
   '';
+
   dontPatchELF = true;
+
   meta = {
     description = "A free fast-paced first-person shooter";
     longDescription = ''
@@ -46,6 +56,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.xonotic.org;
     license = with stdenv.lib.licenses; gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    #platforms = with stdenv.lib.platforms; linux;
   };
 }