pyrox.dev / nixpkgs
lol
fork atom

mangohud: move loader header deps to nativeBuildInputs

Kira Bruneau d9cb1091 eefb3eb9

+9 -16
unified split
+9 -6
pkgs/tools/graphics/mangohud/default.nix
··· 11 , xdg-utils 12 , dbus 13 , hwdata 14 - , libX11 15 , mangohud32 16 , appstream 17 , glslang ··· 22 , pkg-config 23 , unzip 24 , libXNVCtrl 25 , spdlog 26 - , wayland 27 , glew 28 , glfw 29 , nlohmann_json ··· 102 ]; 103 104 libdbus = dbus.lib; 105 - inherit hwdata libX11; 106 }) 107 ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ 108 # Support 32bit OpenGL applications by appending the mangohud32 ··· 142 ninja 143 pkg-config 144 unzip 145 ]; 146 147 buildInputs = [ 148 dbus 149 - libX11 150 - libXNVCtrl 151 spdlog 152 - wayland 153 ] ++ lib.optionals gamescopeSupport [ 154 glew 155 glfw
··· 11 , xdg-utils 12 , dbus 13 , hwdata 14 , mangohud32 15 , appstream 16 , glslang ··· 21 , pkg-config 22 , unzip 23 , libXNVCtrl 24 + , wayland 25 + , libX11 26 , spdlog 27 , glew 28 , glfw 29 , nlohmann_json ··· 102 ]; 103 104 libdbus = dbus.lib; 105 + inherit hwdata; 106 }) 107 ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ 108 # Support 32bit OpenGL applications by appending the mangohud32 ··· 142 ninja 143 pkg-config 144 unzip 145 + 146 + # Only the headers are used from these packages 147 + # The corresponding libraries are loaded at runtime from the app's runpath 148 + libXNVCtrl 149 + wayland 150 + libX11 151 ]; 152 153 buildInputs = [ 154 dbus 155 spdlog 156 ] ++ lib.optionals gamescopeSupport [ 157 glew 158 glfw
-10
pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
··· 11 SPDLOG_ERROR("Could not load libdbus-1.so.3"); 12 return false; 13 } 14 - diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cpp 15 - index 4db6f78..c60d08c 100644 16 - --- a/src/loaders/loader_x11.cpp 17 - +++ b/src/loaders/loader_x11.cpp 18 - @@ -89,4 +89,4 @@ void libx11_loader::CleanUp(bool unload) { 19 - 20 - } 21 - 22 - -std::shared_ptr<libx11_loader> g_x11(new libx11_loader("libX11.so.6")); 23 - +std::shared_ptr<libx11_loader> g_x11(new libx11_loader("@libX11@/lib/libX11.so.6")); 24 diff --git a/src/logging.cpp b/src/logging.cpp 25 index 1668226..f0c8df5 100644 26 --- a/src/logging.cpp
··· 11 SPDLOG_ERROR("Could not load libdbus-1.so.3"); 12 return false; 13 } 14 diff --git a/src/logging.cpp b/src/logging.cpp 15 index 1668226..f0c8df5 100644 16 --- a/src/logging.cpp