Merge pull request #118600 from fgaz/warzone2100/4.0.0

warzone2100: 3.4.1 -> 4.0.0
This commit is contained in:
Sandro 2021-04-06 10:30:17 +02:00 committed by GitHub
commit d7ae55d28d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 17 deletions

View File

@ -1,24 +1,19 @@
{ lib { lib
, mkDerivation , stdenv
, fetchurl , fetchurl
, cmake , cmake
, ninja , ninja
, zip, unzip , zip
, pkg-config , pkg-config
, asciidoctor , asciidoctor
, gettext , gettext
, qtbase
, qtscript
, SDL2 , SDL2
, libtheora , libtheora
, libvorbis , libvorbis
, openal , openal
, openalSoft , openalSoft
, glew
, physfs , physfs
, fribidi
, libXrandr
, miniupnpc , miniupnpc
, libsodium , libsodium
, curl , curl
@ -27,6 +22,9 @@
, harfbuzz , harfbuzz
, sqlite , sqlite
, which , which
, vulkan-headers
, vulkan-loader
, shaderc
, withVideos ? false , withVideos ? false
}: }:
@ -39,27 +37,22 @@ let
}; };
in in
mkDerivation rec { stdenv.mkDerivation rec {
inherit pname; inherit pname;
version = "3.4.1"; version = "4.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
sha256 = "0savalmw1kp1sf8vg5aqrl5hc77p4jacxy5y9qj8k2hi2vqdfb7a"; sha256 = "1d94072yns2xrjpagw1mqq7iyywhwz7vn3lgjdwmbgjy79jzcs1k";
}; };
buildInputs = [ buildInputs = [
qtbase
qtscript
SDL2 SDL2
libtheora libtheora
libvorbis libvorbis
openal openal
openalSoft openalSoft
glew
physfs physfs
fribidi
libXrandr
miniupnpc miniupnpc
libsodium libsodium
curl curl
@ -67,14 +60,18 @@ mkDerivation rec {
freetype freetype
harfbuzz harfbuzz
sqlite sqlite
vulkan-headers
vulkan-loader
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config
cmake cmake
ninja ninja
zip unzip zip
asciidoctor asciidoctor
gettext gettext
shaderc
]; ];
postPatch = '' postPatch = ''

View File

@ -28045,7 +28045,7 @@ in
warsow = callPackage ../games/warsow { }; warsow = callPackage ../games/warsow { };
warzone2100 = libsForQt5.callPackage ../games/warzone2100 { }; warzone2100 = callPackage ../games/warzone2100 { };
wesnoth = callPackage ../games/wesnoth { wesnoth = callPackage ../games/wesnoth {
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;