Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

warzone: 3.2.3 -> 3.3.0 #66500

Merged
merged 2 commits into from Sep 10, 2019
Merged

warzone: 3.2.3 -> 3.3.0 #66500

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdda1e5
warzone: 3.2.3 -> 3.3.0_beta1
rnhmjoj Aug 12, 2019
3516b1d
warzone: 3.3.0_beta1 -> 3.3.0
rnhmjoj Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 19 additions & 10 deletions pkgs/games/warzone2100/default.nix
View file
Open in desktop
@@ -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
}:

Expand All @@ -11,17 +12,24 @@ let
};
in

stdenv.mkDerivation rec {
version = "3.2.3";
name = "${pname}-${version}";
mkDerivation rec {
inherit pname;
version = "3.3.0";

src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz";
sha256 = "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw";
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}-${version}_src.tar.xz";
sha256 = "1s0n67rh32g0bgq72p4qzkcqjlw58gc70r4r6gl9k90pil9chj6c";
};

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 \
Expand All @@ -36,7 +44,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";
Expand Down