From cf0edc3321ebbcc3c37f16d915a25381671609b5 Mon Sep 17 00:00:00 2001 From: Manuel Frischknecht Date: Fri, 26 Jan 2024 14:53:16 +0000 Subject: [PATCH] commandergenius: 2.3.3 -> 3.5.0 The currently packaged version of `Commander-Genius` stopped building with GCC 13, because GCC stopped transitively pulling in a couple of standard headers in various scenarios. Among these is `cstdint`, which declares a couple of standard integer types like `uint32_t`. At the same time, the currently packaged version is rather old already, and these build issues have been resolved upstream in newer versions. This change updates `Commander-Genius` to the most recent upstream release, fixing said build issues in the process as a side effect. --- pkgs/games/commandergenius/default.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 725cc5231c7e..f4e3c6a4504a 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,19 +1,32 @@ -{ lib, stdenv, fetchFromGitLab, SDL2, SDL2_image, pkg-config -, libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 +{ lib +, stdenv +, fetchFromGitLab +, SDL2 +, SDL2_image +, pkg-config +, libvorbis +, libGL +, boost +, cmake +, zlib +, curl +, SDL2_mixer +, SDL2_ttf +, python3 }: stdenv.mkDerivation rec { pname = "commandergenius"; - version = "2.3.3"; + version = "3.5.0"; src = fetchFromGitLab { owner = "Dringgstein"; repo = "Commander-Genius"; rev = "v${version}"; - sha256 = "04nb23wwvc3yywz3cr6gvn02fa7psfs22ssg4wk12s08z1azvz3h"; + hash = "sha256-w5DP7vkvWOs8qcHqoQaEWHnaBwUoi1I4gnE+Z3haHxE="; }; - buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libGL boost libvorbis zlib curl python3 ]; preConfigure = '' export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DSHAREDIR=$out/share"