Author: kkallio
Date: Fri Jul 8 00:59:01 2011
New Revision: 27666
URL: https://svn.nixos.org/websvn/nix/?rev=27666&sc=1
Log:
Repair Wesnoth build error and advance to version 1.8.6.
Deleted:
nixpkgs/trunk/pkgs/games/wesnoth/add-acl-prefix-to-libext.patch
Modified:
nixpkgs/trunk/pkgs/games/wesnoth/default.nix
Modified: nixpkgs/trunk/pkgs/games/wesnoth/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/games/wesnoth/default.nix Thu Jul 7 23:48:38
2011 (r27665)
+++ nixpkgs/trunk/pkgs/games/wesnoth/default.nix Fri Jul 8 00:59:01
2011 (r27666)
@@ -3,32 +3,30 @@
, fribidi, asciidoc }:
stdenv.mkDerivation rec {
- pname = "wesnoth";
- version = "1.8.5";
+ name = "wesnoth";
+ version = "1.8.6";
- name = "${pname}-${version}";
+ pname = "${name}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
- sha256 = "1yjmqvwzz446vvkjg923ypwnmhb0fbgqj0ax0k7s102la37bv8zc";
+ url = "mirror://sourceforge/sourceforge/${name}/${pname}.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 patch and 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.
- patches = ./add-acl-prefix-to-libext.patch;
-
preInstall = ''
sed -i -e s,@MKINSTALLDIRS@,`pwd`/config/mkinstalldirs, po/*/Makefile
'';
configurePhase = ''
./autogen.sh --prefix=$out --with-boost=${boost} \
- --with-preferences-dir=.${name} --program-suffix=-${version} \
+ --with-preferences-dir=.${name} \
--with-datadir-name=${name}
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
