Merge remote-tracking branch 'upstream/master' into gcc-6

3 files changed, 31 insertions, 25 deletions

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 6bceb40b523b..ebf04ec75363 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation {
   meta = {
       description = "A sandbox-building game";
       homepage = http://www.minecraft.net;
-      maintainers = with stdenv.lib.maintainers; [ page ryantm ];
+      maintainers = with stdenv.lib.maintainers; [ cpages ryantm ];
       license = stdenv.lib.licenses.unfreeRedistributable;
   };
 }
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 32ba63709d71..65c2a42922b2 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     description = "Open source clone of UFO: Enemy Unknown";
     homepage = http://openxcom.org;
     repositories.git = https://github.com/SupSuper/OpenXcom.git;
-    maintainers = [ stdenv.lib.maintainers.page ];
+    maintainers = [ stdenv.lib.maintainers.cpages ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3;
   };
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index a1778cc69d79..4d2db9d293f5 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -1,45 +1,51 @@
-{ fetchgit, fetchsvn, cmake, stdenv, plib, SDL, openal, freealut, mesa
-, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
-, fribidi, autoconf, automake, libtool, bluez, libjpeg, libpng }:
+{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig
+, openal, freealut, mesa, libvorbis, libogg, gettext, curl, freetype
+, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr }:
 
-stdenv.mkDerivation rec {
+let
+  dir = "stk-code";
+
+in stdenv.mkDerivation rec {
   name = "supertuxkart-${version}";
 
-  version = "0.9";
+  version = "0.9.2";
   srcs = [
-    (fetchgit {
-      url = "https://github.com/supertuxkart/stk-code";
-      rev = "28a525f6d4aba2667c41a549b027149fcceda97e";
-      sha256 = "0b5izr7j3clm6pcxanwwaas06f17wi454s6hwmgv1mg48aay2v97";
-      name = "stk-code";
+    (fetchFromGitHub {
+      owner  = "supertuxkart";
+      repo   = "stk-code";
+      rev    = version;
+      sha256 = "1zsc5nw8il8xwppk624jampfk6qhqzjnni8zicrhqix0xg07nxca";
+      name   = dir;
     })
     (fetchsvn {
-      url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
-      rev = "16293";
-      sha256 = "07jdkli28xr3rcxvixyy5bwi26n5i7dkhd9q0j4wifgs4pymm8r5";
-      name = "stk-assets";
+      url    = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
+      rev    = "16503"; # 0.9.2 crashes with 16937. Refer to stk-code/doc/assets_version
+      sha256 = "0j1dy27gxm4hx26xddr2ak6vw0lim0nqmjnszfb4c61y92j12cqp";
+      name   = "stk-assets";
     })
   ];
-  
+
   buildInputs = [
-    plib SDL openal freealut mesa libvorbis libogg gettext
-    libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez libjpeg libpng
+    cmake libtool pkgconfig
+    libX11 libXrandr
+    openal freealut mesa libvorbis libogg gettext zlib freetype
+    curl fribidi bluez libjpeg libpng
   ];
 
   enableParallelBuilding = true;
 
-  sourceRoot = "stk-code";
+  sourceRoot = dir;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Free 3D kart racing game";
     longDescription = ''
       SuperTuxKart is a Free 3D kart racing game, with many tracks,
       characters and items for you to try, similar in spirit to Mario
       Kart.
     '';
-    homepage = http://supertuxkart.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ c0dehero fuuzetsu ];
-    platforms = with stdenv.lib.platforms; linux;
+    homepage = https://supertuxkart.net/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ c0dehero fuuzetsu peterhoeg ];
+    platforms = with platforms; linux;
   };
 }