hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 15:45:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Nix/portals.patch: conditionally check portals

Browse source
This commit is contained in:
Mihai Fufezan 2023-06-30 10:13:26 +03:00
parent 1012e2735a
commit 64fc19cc81
No known key found for this signature in database
GPG key ID: 5899325F2F120900
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nix/portals.patch
View file

@ -1,15 +1,18 @@
diff --git a/src/Compositor.cpp b/src/Compositor.cpp diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index a9d95f39..6aa8e7d6 100644 index a9d95f39..069a03ca 100644
--- a/src/Compositor.cpp --- a/src/Compositor.cpp
+++ b/src/Compositor.cpp +++ b/src/Compositor.cpp
@@ -2340,14 +2340,16 @@ void CCompositor::performUserChecks() { @@ -2340,14 +2340,18 @@ void CCompositor::performUserChecks() {
static auto* const PSUPPRESSPORTAL = &g_pConfigManager->getConfigValuePtr("misc:suppress_portal_warnings")->intValue; static auto* const PSUPPRESSPORTAL = &g_pConfigManager->getConfigValuePtr("misc:suppress_portal_warnings")->intValue;
+ static auto const PORTALDIR = std::string(getenv("XDG_DESKTOP_PORTAL_DIR")); - if (!*PSUPPRESSPORTAL) {
+
if (!*PSUPPRESSPORTAL) {
- if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/" + portal + ".portal"); })) { - if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/" + portal + ".portal"); })) {
+ static auto* const PORTALDIRENV = getenv("XDG_DESKTOP_PORTAL_DIR");
+
+ static auto const PORTALDIR = PORTALDIRENV != NULL ? std::string(PORTALDIRENV) : "";
+
+ if (!*PSUPPRESSPORTAL && PORTALDIR != "") {
+ if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists(PORTALDIR + "/" + portal + ".portal"); })) { + if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists(PORTALDIR + "/" + portal + ".portal"); })) {
// bad portal detected // bad portal detected
g_pHyprNotificationOverlay->addNotification("You have one or more incompatible xdg-desktop-portal impls installed. Please remove incompatible ones to avoid issues.", g_pHyprNotificationOverlay->addNotification("You have one or more incompatible xdg-desktop-portal impls installed. Please remove incompatible ones to avoid issues.",