diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2011-10-12 19:16:15 +0000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2011-10-12 19:16:15 +0000 |
commit | a6db3d5723301c641377fd987f5b2355fdd1a230 (patch) | |
tree | 6f5ce9c0bac264be75d088bac3ed27f3e3b0faea /pkgs/games/wesnoth | |
parent | e1a97996f732f63e5c022b99108c854ff8f91533 (diff) | |
download | nixpkgs-a6db3d5723301c641377fd987f5b2355fdd1a230.tar nixpkgs-a6db3d5723301c641377fd987f5b2355fdd1a230.tar.gz nixpkgs-a6db3d5723301c641377fd987f5b2355fdd1a230.tar.bz2 nixpkgs-a6db3d5723301c641377fd987f5b2355fdd1a230.tar.lz nixpkgs-a6db3d5723301c641377fd987f5b2355fdd1a230.tar.xz nixpkgs-a6db3d5723301c641377fd987f5b2355fdd1a230.tar.zst nixpkgs-a6db3d5723301c641377fd987f5b2355fdd1a230.zip |
Fixing package naming in wesnoth broken by r27666
svn path=/nixpkgs/trunk/; revision=29794
Diffstat (limited to 'pkgs/games/wesnoth')
-rw-r--r-- | pkgs/games/wesnoth/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 000fa02b8ab..f9f1ddebc1d 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 ]; |