From bbe42235c8388053c93723e41b6c40db12ec317c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 10 Feb 2024 16:34:01 +0000 Subject: [PATCH 1/2] 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" ]; From ebb01d76dddd0df10460375cd7be3f1853f3efa4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 10 Feb 2024 17:32:59 +0000 Subject: [PATCH 2/2] openmw-tes3mp: fix `gcc-13` build Without the change build on `master` fails as: In file included from /build/source/components/misc/stringops.hpp:8, from /build/source/components/settings/settings.cpp:6: /build/source/components/misc/utf8stream.hpp:11:13: error: 'uint32_t' does not name a type 11 | typedef uint32_t UnicodeChar; | ^~~~~~~~ /build/source/components/misc/utf8stream.hpp:5:1: note: 'uint32_t' is defined in header ''; did you forget to '#include '? 4 | #include +++ |+#include --- pkgs/games/openmw/tes3mp.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 5922b7214c51..915c006f9137 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -98,9 +98,18 @@ let ''; patches = [ + # glibc-2.34 support (fetchpatch { url = "https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch"; - sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw="; + hash = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw="; + }) + + # gcc-13 build fix: + # https://github.com/TES3MP/TES3MP/pull/674 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/TES3MP/TES3MP/commit/7921f71a79e96f817a2009100e5105a7948b3fe2.patch"; + hash = "sha256-mpxuOSPA2xixgBeYXsxutEUI7VJL5PxAeZgaNU7YkJQ="; }) # https://github.com/TES3MP/openmw-tes3mp/issues/552