From bdda1e5b66e81002b8d7a9aef73332164def7705 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 12 Aug 2019 02:38:33 +0200 Subject: warzone: 3.2.3 -> 3.3.0_beta1 --- pkgs/games/warzone2100/default.nix | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 6165cacfdca..b9c310f8296 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchurl, perl, unzip, zip, which, pkgconfig -, qtbase, qtscript, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr +{ stdenv, mkDerivation, fetchurl, autoconf, automake +, perl, unzip, zip, which, pkgconfig, qtbase, qtscript +, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr , withVideos ? false }: @@ -11,17 +12,25 @@ let }; in -stdenv.mkDerivation rec { - version = "3.2.3"; - name = "${pname}-${version}"; +mkDerivation rec { + name = "${pname}-${main}_${sub}"; + main = "3.3.0"; + sub = "beta1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz"; - sha256 = "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw"; + url = "mirror://sourceforge/${pname}/releases/${main}/${name}.tar.xz"; + sha256 = "1jnc334ps88v14cbkp499kk7ini7mbrs1xsz7d04y0w238q407zn"; }; - buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi libXrandr ]; - nativeBuildInputs = [ perl zip unzip pkgconfig ]; + buildInputs = [ + qtbase qtscript SDL2 libtheora openal + glew physfs fribidi libXrandr + ]; + nativeBuildInputs = [ + perl zip unzip pkgconfig autoconf automake + ]; + + preConfigure = "./autogen.sh"; postPatch = '' substituteInPlace lib/exceptionhandler/dumpinfo.cpp \ @@ -36,7 +45,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; + postInstall = stdenv.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"; -- cgit 1.4.1