From a6db3d5723301c641377fd987f5b2355fdd1a230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 12 Oct 2011 19:16:15 +0000
Subject: [PATCH] Fixing package naming in wesnoth broken by r27666

svn path=/nixpkgs/trunk/; revision=29794
---
 pkgs/games/wesnoth/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 000fa02b8ab5..f9f1ddebc1d8 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -3,20 +3,20 @@
 , fribidi, asciidoc }:
 
 stdenv.mkDerivation rec {
-  name = "wesnoth";
+  pname = "wesnoth";
   version = "1.8.6";
 
-  pname = "${name}-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/${name}/${pname}.tar.bz2";
+    url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
     sha256 = "10c01ys846zsy831gprdy2nx3qlzv65s4jy99lw6misak3x07rjg";
   };
 
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
                   automake autoconf freetype libpng pkgconfig lua dbus fontconfig libtool ];
 
-  # The preInstall sed substitution fix errors which I 
+  # The preInstall sed substitution fix errors which I
   # believe arise from autotools version mismatches.  Rather than
   # hunt for the correct automake and autoconf versions these changes
   # make the build work with the versions current in Nixpkgs.
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     ./autogen.sh --prefix=$out --with-boost=${boost} \
-                 --with-preferences-dir=.${name} \
-                 --with-datadir-name=${name}
+                 --with-preferences-dir=.${pname} \
+                 --with-datadir-name=${pname}
   '';
 
   # Make the package build with the gcc currently available in Nixpkgs.
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       reclaim the throne of Wesnoth, or take hand in any number of other
       adventures.
     '';
-    
+
     homepage = http://www.wesnoth.org/;
     license = licenses.gpl2;
     maintainers = [ maintainers.kkallio ];