3
0
Fork 0
forked from mirrors/nixpkgs

mangohud: move loader header deps to nativeBuildInputs

This commit is contained in:
Kira Bruneau 2023-04-14 07:55:56 -04:00
parent eefb3eb9a4
commit d9cb109138
2 changed files with 9 additions and 16 deletions

View file

@ -11,7 +11,6 @@
, xdg-utils
, dbus
, hwdata
, libX11
, mangohud32
, appstream
, glslang
@ -22,8 +21,9 @@
, pkg-config
, unzip
, libXNVCtrl
, spdlog
, wayland
, libX11
, spdlog
, glew
, glfw
, nlohmann_json
@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
];
libdbus = dbus.lib;
inherit hwdata libX11;
inherit hwdata;
})
] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
# Support 32bit OpenGL applications by appending the mangohud32
@ -142,14 +142,17 @@ stdenv.mkDerivation (finalAttrs: {
ninja
pkg-config
unzip
# Only the headers are used from these packages
# The corresponding libraries are loaded at runtime from the app's runpath
libXNVCtrl
wayland
libX11
];
buildInputs = [
dbus
libX11
libXNVCtrl
spdlog
wayland
] ++ lib.optionals gamescopeSupport [
glew
glfw

View file

@ -11,16 +11,6 @@ index 3b3cccb..1405725 100644
SPDLOG_ERROR("Could not load libdbus-1.so.3");
return false;
}
diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cpp
index 4db6f78..c60d08c 100644
--- a/src/loaders/loader_x11.cpp
+++ b/src/loaders/loader_x11.cpp
@@ -89,4 +89,4 @@ void libx11_loader::CleanUp(bool unload) {
}
-std::shared_ptr<libx11_loader> g_x11(new libx11_loader("libX11.so.6"));
+std::shared_ptr<libx11_loader> g_x11(new libx11_loader("@libX11@/lib/libX11.so.6"));
diff --git a/src/logging.cpp b/src/logging.cpp
index 1668226..f0c8df5 100644
--- a/src/logging.cpp