about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorannalee <168274788+annaleeleaves@users.noreply.github.com>2024-05-08 13:44:40 +0000
committerannalee <168274788+annaleeleaves@users.noreply.github.com>2024-05-08 13:44:43 +0000
commit92e4518b8c30a0ac855a37b851441d81df90ca87 (patch)
treef7bd36d4f16e0b4a42bd4e6b9c35f1aa58596380 /pkgs/games
parent4a451cb3ce30544de5693a6578b86fd819789e7d (diff)
colobot: apply upstream patch with gcc13 fixes
https://github.com/colobot/colobot/pull/1559/commits/d47e26586325ec11425cef5c95fc206dc103dbe2
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/colobot/default.nix13
1 files changed, 13 insertions, 0 deletions
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 ];