From 3d4f20972fddef15187c6ec826aad80b867e9180 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 25 Dec 2009 20:56:37 +0000
Subject: [PATCH] update to 1.6.5

svn path=/nixpkgs/trunk/; revision=19128
---
 pkgs/games/wesnoth/default.nix  | 8 ++++----
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index d82e29c4f1b2..54f70f489796 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -2,16 +2,16 @@ args: with args;
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.4.1";
+  version = "1.6.5";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://surfnet.dl.sourceforge.net/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "c5b7b478553dc8994d99024e14b48b3f64e2c328631bd5b05904509b499fa68c";
+    url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
+    sha256 = "1mrhgwp8iw27ifpavnf4y69zf9fqfy7j4sfwkfzsay226sp4gw3y";
   };
 
-  buildInputs = [SDL SDL_image SDL_mixer SDL_net gettext zlib boost freetype];
+  buildInputs = [SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost freetype libpng pkgconfig];
 
   configureFlags = "--with-preferences-dir=.${name} --program-suffix=-${version} --with-datadir-name=${name} --with-boost=${boost}/include --disable-python";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4565236d8cd..68cf69187595 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5912,7 +5912,9 @@ let
   };
 
   wesnoth = import ../games/wesnoth {
-    inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_net gettext zlib boost freetype;
+    inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_net SDL_ttf
+      gettext zlib boost freetype libpng pkgconfig;
+    inherit (gtkLibs) pango;
   };
 
   wirelesstools = import ../os-specific/linux/wireless-tools {