From 991a61702567e4c621a4db7a67f787cbed9acd93 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 27 Aug 2013 12:06:47 +0200
Subject: wesnoth: fix build, minor update, parallel builds

Yes, games are the most important things in nixpkgs...
not that I actually plan to play it anytime soon ;-)
---
 pkgs/games/wesnoth/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkgs/games/wesnoth')

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index b8e53b0cefb..f279127b62b 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -4,20 +4,21 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.10.5";
+  version = "1.10.7";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1rvlr8c3vzhgd33vzc1hfhiil6d7hc3px8r8p79vmp3kwi3d49zn";
+    sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa";
   };
 
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
                   cmake freetype libpng pkgconfig lua dbus fontconfig libtool ];
 
-  # Make the package build with the gcc currently available in Nixpkgs.
-  NIX_CFLAGS_COMPILE = "-Wno-ignored-qualifiers";
+  cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
-- 
cgit 1.4.1