warzone2100: 2.1.5 -> 2.2.2

This commit is contained in:
Nikolay Amiantov 2017-01-07 18:47:55 +03:00
parent 7e3ed8b44f
commit 6a55b52944
2 changed files with 17 additions and 16 deletions

View file

@ -1,7 +1,5 @@
{ stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng
, libtheora, openal, physfs, mesa, fribidi, fontconfig
, freetype, qt4, glew, libogg, libvorbis, zlib, libX11
, libXrandr, zip, unzip, which, perl
{ stdenv, lib, fetchurl, perl, unzip, zip, which, pkgconfig
, qtbase, qtscript, SDL2, libtheora, openal, glew, physfs, fribidi
, withVideos ? false
}:
@ -14,28 +12,31 @@ let
in
stdenv.mkDerivation rec {
version = "3.1.5";
version = "3.2.2";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz";
sha256 = "0hm49i2knvvg3wlnryv7h4m84s3qa7jfyym5yy6365sx8wzcrai1";
sha256 = "064xfxwkqpvqyy7kz46cwi71mxmimxi4wgjly9g51wwxkvz8snmg";
};
buildInputs = [ bison flex gettext pkgconfig libpng libtheora openal
physfs mesa fribidi fontconfig freetype qt4
glew libogg libvorbis zlib libX11 libXrandr zip
unzip perl
];
patchPhase = ''
buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi ];
nativeBuildInputs = [ perl zip unzip pkgconfig ];
postPatch = ''
substituteInPlace lib/exceptionhandler/dumpinfo.cpp \
--replace "which %s" "${which}/bin/which %s"
substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \
--replace "which %s" "${which}/bin/which %s"
'';
configureFlags = "--with-backend=qt --with-distributor=NixOS";
NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
configureFlags = [ "--with-distributor=NixOS" ];
postInstall = stdenv.lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
hardeningDisable = [ "format" ];
enableParallelBuilding = true;
postInstall = lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
meta = with stdenv.lib; {
description = "A free RTS game, originally developed by Pumpkin Studios";

View file

@ -16338,7 +16338,7 @@ in
libjpeg = libjpeg62;
};
warzone2100 = callPackage ../games/warzone2100 { };
warzone2100 = qt5.callPackage ../games/warzone2100 { };
wesnoth = callPackage ../games/wesnoth { };