From bbe42235c8388053c93723e41b6c40db12ec317c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 10 Feb 2024 16:34:01 +0000 Subject: [PATCH] openmw-tes3mp: fix `raknet` depend build on `gcc-13` Without the change build fails on `master` as https://cache.nixos.org/log/hhs17z23wxncxpbcgy1w98w5zh6xh8qw-raknet-unstable-2020-01-19.drv: In file included from /build/source/Source/Utils/_FindFirst.cpp:7: /build/source/Source/Utils/_FindFirst.h:50:15: error: 'intptr_t' was not declared in this scope 50 | int _findnext(intptr_t h, _finddata_t *f); | ^~~~~~~~ --- pkgs/games/openmw/tes3mp.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 5662f2356833..5922b7214c51 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -27,6 +27,16 @@ let sha256 = "WIaJkSQnoOm9T7GoAwmWl7fNg79coIo/ILUsWcbH+lA="; }; + patches = [ + # gcc-13 build fix: + # https://github.com/TES3MP/CrabNet/pull/18 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/TES3MP/CrabNet/commit/3ec9a338a7cefd5cc751c9d29095cafa4c73be20.patch"; + hash = "sha256-zE87icjX9GSnApgKQXj0K4IjlrReV/upFLjVgNYkNfM="; + }) + ]; + cmakeFlags = [ "-DCRABNET_ENABLE_DLL=OFF" ];