diff options
| author | kirillrdy <kirillrdy@gmail.com> | 2024-02-14 20:14:36 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-14 20:14:36 +1100 |
| commit | c490abf6c4a980ca2e4604084fd68b4b6ec2c6cc (patch) | |
| tree | cf1edc0338b1286e27dfccf4b561aa8e23ceeaeb /pkgs/games | |
| parent | cd54cfb658332c311cbfeeb29f3df327b7556b70 (diff) | |
| parent | ebb01d76dddd0df10460375cd7be3f1853f3efa4 (diff) | |
Merge pull request #287827 from trofi/openmw-tes3mp-gcc-13-fix
openmw-tes3mp: fix `gcc-13` build
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/openmw/tes3mp.nix | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 5662f2356833f..915c006f91375 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" ]; @@ -88,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 |