mangohud: switch back to using system spdlog

The issue that required us to use the static subproject version has
been fixed:

https://github.com/ValveSoftware/steam-runtime/issues/511

+3 -23
+3 -23
pkgs/tools/graphics/mangohud/default.nix
··· 22 22 , pkg-config 23 23 , unzip 24 24 , libXNVCtrl 25 + , spdlog 25 26 , wayland 26 27 , glew 27 28 , glfw ··· 47 48 }; 48 49 }; 49 50 50 - # Derived from subprojects/spdlog.wrap 51 - # 52 - # NOTE: We only statically link spdlog due to a bug in pressure-vessel: 53 - # https://github.com/ValveSoftware/steam-runtime/issues/511 54 - # 55 - # Once this fix is released upstream, we should switch back to using 56 - # the system provided spdlog 57 - spdlog = rec { 58 - version = "1.8.5"; 59 - src = fetchFromGitHub { 60 - owner = "gabime"; 61 - repo = "spdlog"; 62 - rev = "refs/tags/v${version}"; 63 - sha256 = "sha256-D29jvDZQhPscaOHlrzGN1s7/mXlcsovjbqYpXd7OM50="; 64 - }; 65 - patch = fetchurl { 66 - url = "https://wrapdb.mesonbuild.com/v2/spdlog_${version}-1/get_patch"; 67 - sha256 = "sha256-PDjyddV5KxKGORECWUMp6YsXc3kks0T5gxKrCZKbdL4="; 68 - }; 69 - }; 70 - 71 51 # Derived from subprojects/vulkan-headers.wrap 72 52 vulkan-headers = rec { 73 53 version = "1.2.158"; ··· 101 81 postUnpack = ''( 102 82 cd "$sourceRoot/subprojects" 103 83 cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} 104 - cp -R --no-preserve=mode,ownership ${spdlog.src} spdlog-${spdlog.version} 105 84 cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version} 106 85 )''; 107 86 ··· 142 121 postPatch = ''( 143 122 cd subprojects 144 123 unzip ${imgui.patch} 145 - unzip ${spdlog.patch} 146 124 unzip ${vulkan-headers.patch} 147 125 )''; 148 126 149 127 mesonFlags = [ 150 128 "-Dwith_wayland=enabled" 129 + "-Duse_system_spdlog=enabled" 151 130 ] ++ lib.optionals gamescopeSupport [ 152 131 "-Dmangoapp_layer=true" 153 132 "-Dmangoapp=true" ··· 169 148 dbus 170 149 libX11 171 150 libXNVCtrl 151 + spdlog 172 152 wayland 173 153 ] ++ lib.optionals gamescopeSupport [ 174 154 glew