From 65bfbb80d3353428307ff23f9c350ce9ca2bfbd4 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 5 Apr 2021 16:08:32 +0200 Subject: [PATCH] warzone2100: 3.4.1 -> 4.0.0 --- pkgs/games/warzone2100/default.nix | 29 +++++++++++++---------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index ce330536b751..a90f76743d73 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,24 +1,19 @@ { lib -, mkDerivation +, stdenv , fetchurl , cmake , ninja -, zip, unzip +, zip , pkg-config , asciidoctor , gettext -, qtbase -, qtscript , SDL2 , libtheora , libvorbis , openal , openalSoft -, glew , physfs -, fribidi -, libXrandr , miniupnpc , libsodium , curl @@ -27,6 +22,9 @@ , harfbuzz , sqlite , which +, vulkan-headers +, vulkan-loader +, shaderc , withVideos ? false }: @@ -39,27 +37,22 @@ let }; in -mkDerivation rec { +stdenv.mkDerivation rec { inherit pname; - version = "3.4.1"; + version = "4.0.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "0savalmw1kp1sf8vg5aqrl5hc77p4jacxy5y9qj8k2hi2vqdfb7a"; + sha256 = "1d94072yns2xrjpagw1mqq7iyywhwz7vn3lgjdwmbgjy79jzcs1k"; }; buildInputs = [ - qtbase - qtscript SDL2 libtheora libvorbis openal openalSoft - glew physfs - fribidi - libXrandr miniupnpc libsodium curl @@ -67,14 +60,18 @@ mkDerivation rec { freetype harfbuzz sqlite + vulkan-headers + vulkan-loader ]; nativeBuildInputs = [ + pkg-config cmake ninja - zip unzip + zip asciidoctor gettext + shaderc ]; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68ede4a7ef74..4ed43535a323 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27848,7 +27848,7 @@ in warsow = callPackage ../games/warsow { }; - warzone2100 = libsForQt5.callPackage ../games/warzone2100 { }; + warzone2100 = callPackage ../games/warzone2100 { }; wesnoth = callPackage ../games/wesnoth { inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;