tes3mp: fix working (#88061)

authored by gnidorah and committed by GitHub 6405edf2 48f0d8b3

+20 -7
+6
pkgs/games/openmw/tes3mp.nix
··· 50 50 "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" 51 51 ]; 52 52 53 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95175 54 + patches = [ 55 + ./tes3mp.patch 56 + ]; 57 + NIX_CFLAGS_COMPILE = "-fpermissive"; 58 + 53 59 preConfigure = '' 54 60 substituteInPlace files/version.in \ 55 61 --subst-var-by OPENMW_VERSION_COMMITHASH ${compatHash}
+13
pkgs/games/openmw/tes3mp.patch
··· 1 + diff --git a/apps/openmw-mp/Script/Types.hpp b/apps/openmw-mp/Script/Types.hpp 2 + index be365cfb8..204dcdc7b 100644 3 + --- a/apps/openmw-mp/Script/Types.hpp 4 + +++ b/apps/openmw-mp/Script/Types.hpp 5 + @@ -105,7 +105,7 @@ struct ScriptFunctionPointer : public ScriptIdentity 6 + void *addr; 7 + #if (!defined(__clang__) && defined(__GNUC__)) 8 + template<typename R, typename... Types> 9 + - constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr((void*)(addr)) {} 10 + + constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {} 11 + #else 12 + template<typename R, typename... Types> 13 + constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {}
+1 -7
pkgs/top-level/all-packages.nix
··· 23764 23764 23765 23765 openmw = libsForQt5.callPackage ../games/openmw { }; 23766 23766 23767 - openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { 23768 - openmw = openmw.override { 23769 - stdenv = gcc8Stdenv; 23770 - openscenegraph = openscenegraph.override { stdenv = gcc8Stdenv; }; 23771 - mygui = mygui.override { stdenv = gcc8Stdenv; }; 23772 - }; 23773 - }; 23767 + openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; 23774 23768 23775 23769 openraPackages = import ../games/openra pkgs; 23776 23770