public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wesnoth: 1.12.5 -> 1.12.6

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-05-30 22:15:36 +03:00
parent d248aef1cf
commit 53dd68651a
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/games/wesnoth/default.nix
View File

@ -1,25 +1,25 @@
{ stdenv, fetchurl, cmake, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango { stdenv, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf
, gettext, zlib, boost, freetype, libpng, pkgconfig, lua, dbus, fontconfig, libtool , pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre
, fribidi, asciidoc, libpthreadstubs, libXdmcp, libxshmfence, libvorbis }: , enableTools ? false
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wesnoth"; pname = "wesnoth";
version = "1.12.5"; version = "1.12.6";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
sha256 = "07d8ms9ayswg2g530p0zwmz3d77zv68l6nmc718iq9sbv90av6jr"; sha256 = "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext boost
boost fribidi freetype libpng lua libpthreadstubs libXdmcp libvorbis fribidi dbus libpng pcre ];
dbus fontconfig libtool libxshmfence libvorbis ];
cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030 cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
homepage = http://www.wesnoth.org/; homepage = http://www.wesnoth.org/;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.kkallio ]; maintainers = with maintainers; [ kkallio abbradar ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -15437,9 +15437,7 @@ in
warzone2100 = callPackage ../games/warzone2100 { }; warzone2100 = callPackage ../games/warzone2100 { };
wesnoth = callPackage ../games/wesnoth { wesnoth = callPackage ../games/wesnoth { };
lua = lua5;
};
widelands = callPackage ../games/widelands { widelands = callPackage ../games/widelands {
lua = lua5_1; lua = lua5_1;