Unverified Commit 731666d8 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #310114 from annaleeleaves/colobot

colobot: apply upstream patch with gcc13 fixes
parents dfd8445b 92e4518b
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -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 ];