From 92e4518b8c30a0ac855a37b851441d81df90ca87 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Wed, 8 May 2024 13:44:40 +0000 Subject: colobot: apply upstream patch with gcc13 fixes https://github.com/colobot/colobot/pull/1559/commits/d47e26586325ec11425cef5c95fc206dc103dbe2 --- pkgs/games/colobot/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'pkgs/games') diff --git a/pkgs/games/colobot/default.nix b/pkgs/games/colobot/default.nix index e1070843811c5..aa4de1c7ec541 100644 --- a/pkgs/games/colobot/default.nix +++ b/pkgs/games/colobot/default.nix @@ -18,6 +18,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-Nu7NyicNIk5yza9sXfd4KbGdB65guVuGREd6rwRU3lU="; }; + patches = [ + # https://github.com/colobot/colobot/pull/1559 + # gcc13 fixes. remove on next update + (fetchpatch { + name = "gcc13-fixes.patch"; + url = "https://github.com/colobot/colobot/commit/d47e26586325ec11425cef5c95fc206dc103dbe2.patch"; + hash = "sha256-2DmLkyoyiZSW0yeZDSSWFjCEJos25jPHZQi1yuJGFko="; + excludes = [ + "src/object/task/taskgoto.h" + ]; + }) + ]; + nativeBuildInputs = [ cmake xmlstarlet doxygen python3 ]; buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ]; -- cgit 1.4.1