colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #287827 from trofi/openmw-tes3mp-gcc-13-fix

Browse Source 
openmw-tes3mp: fix `gcc-13` build
This commit is contained in:
kirillrdy 2024-02-14 20:14:36 +11:00 committed by GitHub
commit c490abf6c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/games/openmw/tes3mp.nix
View File

@ -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