diff options
author | Karn Kallio <tierpluspluslists@gmail.com> | 2012-04-22 05:31:22 +0000 |
---|---|---|
committer | Karn Kallio <tierpluspluslists@gmail.com> | 2012-04-22 05:31:22 +0000 |
commit | e81f9de12174e3a681ab5d1b63cf618afca1625b (patch) | |
tree | 2cecf046da797fb77dd18c1cd556af95812a334e /pkgs/games | |
parent | 2dbe2887edb561a66273449c45a8920e849d6153 (diff) |
Advance wesnoth version to 1.10.2; fixes old version failing build.
svn path=/nixpkgs/trunk/; revision=33874
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/wesnoth/default.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index f9f1ddebc1d8e..e8ba8e7b74909 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,34 +1,34 @@ -{ stdenv, fetchurl, automake, autoconf, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango +{ stdenv, fetchurl, cmake, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango , gettext, zlib, boost, freetype, libpng, pkgconfig, lua, dbus, fontconfig, libtool , fribidi, asciidoc }: stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.8.6"; + version = "1.10.2"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "10c01ys846zsy831gprdy2nx3qlzv65s4jy99lw6misak3x07rjg"; + sha256 = "0hawzq85sq0kdddj0s7y6kpx043g1hsl7cvyw1xcxqh45hkgw2ix"; }; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi - automake autoconf freetype libpng pkgconfig lua dbus fontconfig libtool ]; + cmake freetype libpng pkgconfig lua dbus fontconfig libtool ]; # 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. - preInstall = '' - sed -i -e s,@MKINSTALLDIRS@,`pwd`/config/mkinstalldirs, po/*/Makefile - ''; - - configurePhase = '' - ./autogen.sh --prefix=$out --with-boost=${boost} \ - --with-preferences-dir=.${pname} \ - --with-datadir-name=${pname} - ''; +# preInstall = '' +# sed -i -e s,@MKINSTALLDIRS@,`pwd`/config/mkinstalldirs, po/*/Makefile +# ''; + +# configurePhase = '' +# ./autogen.sh --prefix=$out --with-boost=${boost} \ +# --with-preferences-dir=.${pname} \ +# --with-datadir-name=${pname} +# ''; # Make the package build with the gcc currently available in Nixpkgs. NIX_CFLAGS_COMPILE = "-Wno-ignored-qualifiers"; |