Merge commit 'refs/pull/14779/head' of git://github.com/NixOS/nixpkgs

+15 -12
+15 -12
pkgs/games/warzone2100/default.nix
··· 1 1 { stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng 2 2 , libtheora, openal, physfs, mesa, fribidi, fontconfig 3 3 , freetype, qt4, glew, libogg, libvorbis, zlib, libX11 4 - , libXrandr, zip, unzip, which 4 + , libXrandr, zip, unzip, which, perl 5 5 , withVideos ? false 6 6 }: 7 - stdenv.mkDerivation rec { 7 + 8 + let 8 9 pname = "warzone2100"; 9 - version = "3.1.1"; 10 + sequences_src = fetchurl { 11 + url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz"; 12 + sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa"; 13 + }; 14 + in 15 + 16 + stdenv.mkDerivation rec { 17 + version = "3.1.5"; 10 18 name = "${pname}-${version}"; 11 19 src = fetchurl { 12 20 url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz"; 13 - sha256 = "c937a2e2c7afdad00b00767636234bbec4d8b18efb008073445439d32edb76cf"; 14 - }; 15 - sequences_src = fetchurl { 16 - url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz"; 17 - sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa"; 21 + sha256 = "0hm49i2knvvg3wlnryv7h4m84s3qa7jfyym5yy6365sx8wzcrai1"; 18 22 }; 19 23 buildInputs = [ bison flex gettext pkgconfig libpng libtheora openal 20 24 physfs mesa fribidi fontconfig freetype qt4 21 25 glew libogg libvorbis zlib libX11 libXrandr zip 22 - unzip 26 + unzip perl 23 27 ]; 24 28 patchPhase = '' 25 29 substituteInPlace lib/exceptionhandler/dumpinfo.cpp \ ··· 31 35 32 36 NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility 33 37 34 - postInstall = [] 35 - ++ stdenv.lib.optional withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; 38 + postInstall = stdenv.lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; 36 39 37 40 meta = with stdenv.lib; { 38 41 description = "A free RTS game, originally developed by Pumpkin Studios"; ··· 45 48 missiles. The game offers campaign, multi-player, and single-player 46 49 skirmish modes. An extensive tech tree with over 400 different 47 50 technologies, combined with the unit design system, allows for a wide 48 - variety of possible units and tactics. 51 + variety of possible units and tactics. 49 52 ''; 50 53 homepage = http://wz2100.net; 51 54 license = licenses.gpl2Plus;