wesnoth: 1.12.5 -> 1.12.6
This commit is contained in:
parent
d248aef1cf
commit
53dd68651a
|
@ -1,25 +1,25 @@
|
|||
{ 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, libpthreadstubs, libXdmcp, libxshmfence, libvorbis }:
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf
|
||||
, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre
|
||||
, enableTools ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wesnoth";
|
||||
version = "1.12.5";
|
||||
version = "1.12.6";
|
||||
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
|
||||
sha256 = "07d8ms9ayswg2g530p0zwmz3d77zv68l6nmc718iq9sbv90av6jr";
|
||||
sha256 = "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib
|
||||
boost fribidi freetype libpng lua libpthreadstubs libXdmcp
|
||||
dbus fontconfig libtool libxshmfence libvorbis ];
|
||||
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext boost
|
||||
libvorbis fribidi dbus libpng pcre ];
|
||||
|
||||
cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030
|
||||
cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
homepage = http://www.wesnoth.org/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.kkallio ];
|
||||
maintainers = with maintainers; [ kkallio abbradar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -15437,9 +15437,7 @@ in
|
|||
|
||||
warzone2100 = callPackage ../games/warzone2100 { };
|
||||
|
||||
wesnoth = callPackage ../games/wesnoth {
|
||||
lua = lua5;
|
||||
};
|
||||
wesnoth = callPackage ../games/wesnoth { };
|
||||
|
||||
widelands = callPackage ../games/widelands {
|
||||
lua = lua5_1;
|
||||
|
|
Loading…
Reference in a new issue