openmw: enable with glibc fix

authored by Nick Novitski and committed by Peter Hoeg fb7287e6 90bd7d73

+10 -6
+8 -5
pkgs/games/openmw/default.nix
··· 1 1 { lib 2 2 , mkDerivation 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , cmake 5 6 , pkg-config 6 7 , wrapQtAppsHook ··· 55 56 sha256 = "sha256-Xq9hDUTCQr79Zzjk0CsiXclVTHK6nrSowukIQqVdrKY="; 56 57 }; 57 58 59 + patches = [ 60 + (fetchpatch { 61 + url = "https://gitlab.com/OpenMW/openmw/-/merge_requests/1239.diff"; 62 + sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw="; 63 + }) 64 + ]; 65 + 58 66 nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; 59 67 60 68 buildInputs = [ ··· 83 91 license = licenses.gpl3Plus; 84 92 maintainers = with maintainers; [ abbradar marius851000 ]; 85 93 platforms = platforms.linux; 86 - 87 - # 2021-10-13, doesn't compile with glibc-2.34, maintainers prefer a fix on glibc's end. 88 - # Can be marked as un-broken as soon as https://gitlab.com/OpenMW/openmw/-/merge_requests/1239 89 - # is resolved and a patch is appliable here. 90 - broken = true; 91 94 }; 92 95 }
+2 -1
pkgs/games/openmw/tes3mp.nix
··· 87 87 ''; 88 88 89 89 # https://github.com/TES3MP/openmw-tes3mp/issues/552 90 - patches = [ ./tes3mp.patch ]; 90 + patches = oldAttrs.patches ++ [ ./tes3mp.patch ]; 91 91 92 92 NIX_CFLAGS_COMPILE = "-fpermissive"; 93 93 ··· 108 108 license = licenses.gpl3Only; 109 109 maintainers = with maintainers; [ peterhoeg ]; 110 110 platforms = [ "x86_64-linux" "i686-linux" ]; 111 + broken = true; 111 112 }; 112 113 }); 113 114