Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374diff --git a/src/dbus.cpp b/src/dbus.cppindex 7379af1..4eef3fe 100644--- a/src/dbus.cpp+++ b/src/dbus.cpp@@ -152,7 +152,7 @@ bool dbus_manager::get_media_player_metadata(metadata& meta, std::string name) { } bool dbus_manager::init_internal() {- if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("libdbus-1.so.3")) {+ if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("@libdbus@/lib/libdbus-1.so.3")) { SPDLOG_ERROR("Could not load libdbus-1.so.3"); return false; }diff --git a/src/loaders/loader_glx.cpp b/src/loaders/loader_glx.cppindex aa453b8..0f6479d 100644--- a/src/loaders/loader_glx.cpp+++ b/src/loaders/loader_glx.cpp@@ -23,7 +23,7 @@ bool glx_loader::Load() { handle = real_dlopen("glxtrace.so", RTLD_LAZY); #endif if (!handle)- handle = real_dlopen("libGL.so.1", RTLD_LAZY);+ handle = real_dlopen("@libGL@/lib/libGL.so.1", RTLD_LAZY); if (!handle) { SPDLOG_ERROR("Failed to open " MANGOHUD_ARCH " libGL.so.1: {}", dlerror()); return false;diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cppindex 214fd50..2f08857 100644--- a/src/loaders/loader_x11.cpp+++ b/src/loaders/loader_x11.cpp@@ -110,6 +110,6 @@ static std::shared_ptr<libx11_loader> loader; std::shared_ptr<libx11_loader> get_libx11() { if (!loader)- loader = std::make_shared<libx11_loader>("libX11.so.6");+ loader = std::make_shared<libx11_loader>("@libX11@/lib/libX11.so.6"); return loader; }diff --git a/src/logging.cpp b/src/logging.cppindex 4ef7023..e24f6da 100644--- a/src/logging.cpp+++ b/src/logging.cpp@@ -28,8 +28,12 @@ string exec(string command) { #endif std::array<char, 128> buffer; std::string result;++ char* originalPath = getenv("PATH");+ setenv("PATH", "@path@", 1); auto deleter = [](FILE* ptr){ pclose(ptr); }; std::unique_ptr<FILE, decltype(deleter)> pipe(popen(command.c_str(), "r"), deleter);+ setenv("PATH", originalPath, 1); if (!pipe) { return "popen failed!"; }diff --git a/src/pci_ids.cpp b/src/pci_ids.cppindex 002a843..5a6262b 100644--- a/src/pci_ids.cpp+++ b/src/pci_ids.cpp@@ -24,11 +24,9 @@ static std::istream& get_uncommented_line(std::istream& is, std::string &line) void parse_pciids() { std::ifstream file;- file.open("/usr/share/hwdata/pci.ids");+ file.open("@hwdata@/share/hwdata/pci.ids"); if (file.fail()){- file.open("/usr/share/misc/pci.ids");- if (file.fail())- SPDLOG_ERROR("can't find file pci.ids");+ SPDLOG_ERROR("can't find file pci.ids"); } std::string line;