pyrox.dev / nixpkgs
lol
fork atom

openmw-tes3mp: add fix for gcc14

Marcin Serwin 325e7cd4 7dfdd24a

+28
unified split
+25
pkgs/games/openmw/tes3mp-gcc14-fix.patch
···
··· 1 + diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp 2 + index 2daf734..b77d2a8 100644 3 + --- a/apps/openmw/mwstate/charactermanager.hpp 4 + +++ b/apps/openmw/mwstate/charactermanager.hpp 5 + @@ -1,6 +1,8 @@ 6 + #ifndef GAME_STATE_CHARACTERMANAGER_H 7 + #define GAME_STATE_CHARACTERMANAGER_H 8 + 9 + +#include <list> 10 + + 11 + #include <boost/filesystem/path.hpp> 12 + 13 + #include "character.hpp" 14 + diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp 15 + index 6eef4b9..608323e 100644 16 + --- a/components/vfs/filesystemarchive.cpp 17 + +++ b/components/vfs/filesystemarchive.cpp 18 + @@ -1,5 +1,7 @@ 19 + #include "filesystemarchive.hpp" 20 + 21 + +#include <algorithm> 22 + + 23 + #include <boost/filesystem.hpp> 24 + 25 + #include <components/debug/debuglog.hpp>
+3
pkgs/games/openmw/tes3mp.nix
··· 114 115 # https://github.com/TES3MP/openmw-tes3mp/issues/552 116 ./tes3mp.patch 117 ]; 118 119 env.NIX_CFLAGS_COMPILE = "-fpermissive";
··· 114 115 # https://github.com/TES3MP/openmw-tes3mp/issues/552 116 ./tes3mp.patch 117 + 118 + # https://github.com/TES3MP/TES3MP/pull/691 119 + ./tes3mp-gcc14-fix.patch 120 ]; 121 122 env.NIX_CFLAGS_COMPILE = "-fpermissive";