diff options
| author | Vaxry <[email protected]> | 2024-02-03 18:32:59 +0000 |
|---|---|---|
| committer | Vaxry <[email protected]> | 2024-02-03 18:32:59 +0000 |
| commit | 5d4ff60f535b65dc3db4cd0fb20e44c1f4360769 (patch) | |
| tree | 3b1ee4e6d195e4a0456c9c66e709a061e032fe21 /hyprpm | |
| parent | 504ebe1b373726947a44fa2d6a68498d0edb85b6 (diff) | |
| download | Hyprland-5d4ff60f535b65dc3db4cd0fb20e44c1f4360769.tar.gz Hyprland-5d4ff60f535b65dc3db4cd0fb20e44c1f4360769.zip | |
hyprpm: fix invalid pkg-config path env in build
ref #4573
Diffstat (limited to 'hyprpm')
| -rw-r--r-- | hyprpm/src/core/PluginManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hyprpm/src/core/PluginManager.cpp b/hyprpm/src/core/PluginManager.cpp index 49e2a3bf..4b026090 100644 --- a/hyprpm/src/core/PluginManager.cpp +++ b/hyprpm/src/core/PluginManager.cpp @@ -210,7 +210,7 @@ bool CPluginManager::addNewPluginRepo(const std::string& url) { progress.printMessageAbove(std::string{Colors::RESET} + " → Building " + p.name); for (auto& bs : p.buildSteps) { - std::string cmd = std::format("cd /tmp/hyprpm/new && PKG_CONFIG_PATH=\"{}\" {}", DataState::getHeadersPath(), bs); + std::string cmd = std::format("cd /tmp/hyprpm/new && PKG_CONFIG_PATH=\"{}/share/pkgconfig\" {}", DataState::getHeadersPath(), bs); out += " -> " + cmd + "\n" + execAndGet(cmd) + "\n"; } @@ -289,7 +289,7 @@ eHeadersErrors CPluginManager::headersValid() { return HEADERS_MISSING; // find headers commit - std::string cmd = std::format("PKG_CONFIG_PATH={}/share/pkgconfig pkg-config --cflags --keep-system-cflags hyprland", DataState::getHeadersPath()); + std::string cmd = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkg-config --cflags --keep-system-cflags hyprland", DataState::getHeadersPath()); auto headers = execAndGet(cmd.c_str()); if (!headers.contains("-I/")) @@ -560,7 +560,7 @@ bool CPluginManager::updatePlugins(bool forceUpdateAll) { progress.printMessageAbove(std::string{Colors::RESET} + " → Building " + p.name); for (auto& bs : p.buildSteps) { - std::string cmd = std::format("cd /tmp/hyprpm/update && PKG_CONFIG_PATH=\"{}\" {}", DataState::getHeadersPath(), bs); + std::string cmd = std::format("cd /tmp/hyprpm/update && PKG_CONFIG_PATH=\"{}/share/pkgconfig\" {}", DataState::getHeadersPath(), bs); out += " -> " + cmd + "\n" + execAndGet(cmd) + "\n"; } |