pyrox.dev
1diff --git a/src/dbus.cpp b/src/dbus.cpp
2index 7379af1..4eef3fe 100644
3--- a/src/dbus.cpp
4+++ b/src/dbus.cpp
5@@ -152,7 +152,7 @@ bool dbus_manager::get_media_player_metadata(metadata& meta, std::string name) {
6 }
7
8 bool dbus_manager::init_internal() {
9- if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("libdbus-1.so.3")) {
10+ if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("@libdbus@/lib/libdbus-1.so.3")) {
11 SPDLOG_ERROR("Could not load libdbus-1.so.3");
12 return false;
13 }
14diff --git a/src/logging.cpp b/src/logging.cpp
15index 046c847..42782be 100644
16--- a/src/logging.cpp
17+++ b/src/logging.cpp
18@@ -26,7 +26,11 @@ string exec(string command) {
19 #endif
20 std::array<char, 128> buffer;
21 std::string result;
22+
23+ char* originalPath = getenv("PATH");
24+ setenv("PATH", "@path@", 1);
25 std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(command.c_str(), "r"), pclose);
26+ setenv("PATH", originalPath, 1);
27 if (!pipe) {
28 return "popen failed!";
29 }
30diff --git a/src/pci_ids.cpp b/src/pci_ids.cpp
31index 002a843..5a6262b 100644
32--- a/src/pci_ids.cpp
33+++ b/src/pci_ids.cpp
34@@ -24,11 +24,9 @@ static std::istream& get_uncommented_line(std::istream& is, std::string &line)
35 void parse_pciids()
36 {
37 std::ifstream file;
38- file.open("/usr/share/hwdata/pci.ids");
39+ file.open("@hwdata@/share/hwdata/pci.ids");
40 if (file.fail()){
41- file.open("/usr/share/misc/pci.ids");
42- if (file.fail())
43- SPDLOG_ERROR("can't find file pci.ids");
44+ SPDLOG_ERROR("can't find file pci.ids");
45 }
46
47 std::string line;