pyrox.dev
mangohud: hardcode libGL & libX11
+4
-1
pkgs/tools/graphics/mangohud/default.nix
+4
-1
pkgs/tools/graphics/mangohud/default.nix
···
10
10
gnused,
11
11
xdg-utils,
12
12
dbus,
13
+
libGL,
14
+
libX11,
13
15
hwdata,
14
16
mangohud32,
15
17
addDriverRunpath,
···
20
22
ninja,
21
23
pkg-config,
22
24
unzip,
23
-
libX11,
24
25
wayland,
25
26
libXNVCtrl,
26
27
nlohmann_json,
···
138
139
];
139
140
140
141
libdbus = dbus.lib;
142
+
libGL = libGL;
143
+
libX11 = libX11;
141
144
inherit hwdata;
142
145
})
143
146
];
+26
-1
pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
+26
-1
pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
···
11
11
SPDLOG_ERROR("Could not load libdbus-1.so.3");
12
12
return false;
13
13
}
14
+
diff --git a/src/loaders/loader_glx.cpp b/src/loaders/loader_glx.cpp
15
+
index aa453b8..0f6479d 100644
16
+
--- a/src/loaders/loader_glx.cpp
17
+
+++ b/src/loaders/loader_glx.cpp
18
+
@@ -23,7 +23,7 @@ bool glx_loader::Load() {
19
+
handle = real_dlopen("glxtrace.so", RTLD_LAZY);
20
+
#endif
21
+
if (!handle)
22
+
- handle = real_dlopen("libGL.so.1", RTLD_LAZY);
23
+
+ handle = real_dlopen("@libGL@/lib/libGL.so.1", RTLD_LAZY);
24
+
if (!handle) {
25
+
SPDLOG_ERROR("Failed to open " MANGOHUD_ARCH " libGL.so.1: {}", dlerror());
26
+
return false;
27
+
diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cpp
28
+
index 214fd50..2f08857 100644
29
+
--- a/src/loaders/loader_x11.cpp
30
+
+++ b/src/loaders/loader_x11.cpp
31
+
@@ -110,6 +110,6 @@ static std::shared_ptr<libx11_loader> loader;
32
+
std::shared_ptr<libx11_loader> get_libx11()
33
+
{
34
+
if (!loader)
35
+
- loader = std::make_shared<libx11_loader>("libX11.so.6");
36
+
+ loader = std::make_shared<libx11_loader>("@libX11@/lib/libX11.so.6");
37
+
return loader;
38
+
}
14
39
diff --git a/src/logging.cpp b/src/logging.cpp
15
-
index ca986d4..c4d99ea 100644
40
+
index 4ef7023..e24f6da 100644
16
41
--- a/src/logging.cpp
17
42
+++ b/src/logging.cpp
18
43
@@ -28,8 +28,12 @@ string exec(string command) {