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

wesnoth: unite with wesnoth-dev 

There's no Wesnoth development version now.
This commit is contained in:
Nikolay Amiantov 2018-05-08 16:03:52 +03:00
parent 851d5d72a3
commit d541169e1a
3 changed files with 11 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,35 +1,28 @@
{ stdenv, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre , pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
, makeWrapper, enableTools ? false , enableTools ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wesnoth"; pname = "wesnoth";
version = "1.12.6"; version = "1.14.0";
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 = "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5"; sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw";
}; };
nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext boost buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost
libvorbis fribidi dbus libpng pcre ]; libvorbis fribidi dbus libpng pcre openssl icu ];
cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ];
enableParallelBuilding = true; enableParallelBuilding = true;
# Wesnoth doesn't support input frameworks and Unicode input breaks when they are enabled.
postInstall = ''
for i in $out/bin/*; do
wrapProgram "$i" --unset XMODIFIERS
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
longDescription = '' longDescription = ''
@ -42,7 +35,7 @@ stdenv.mkDerivation rec {
homepage = http://www.wesnoth.org/; homepage = http://www.wesnoth.org/;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ kkallio abbradar ]; maintainers = with maintainers; [ abbradar ];
platforms = platforms.unix; platforms = platforms.linux;
}; };
} }

41
pkgs/games/wesnoth/dev.nix
View File

@ -1,41 +0,0 @@
{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
, enableTools ? false
}:
stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.14.0";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost
libvorbis fribidi dbus libpng pcre openssl icu ];
cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
longDescription = ''
The Battle for Wesnoth is a Free, turn-based tactical strategy
game with a high fantasy theme, featuring both single-player, and
online/hotseat multiplayer combat. Fight a desperate battle to
reclaim the throne of Wesnoth, or take hand in any number of other
adventures.
'';
homepage = http://www.wesnoth.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux;
};
}

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

@ -19622,7 +19622,7 @@ with pkgs;
wesnoth = callPackage ../games/wesnoth { }; wesnoth = callPackage ../games/wesnoth { };
wesnoth-dev = callPackage ../games/wesnoth/dev.nix { }; wesnoth-dev = wesnoth;
widelands = callPackage ../games/widelands { widelands = callPackage ../games/widelands {
lua = lua5_2; lua = lua5_2;