diff options
| author | Mihai Fufezan <[email protected]> | 2023-06-30 10:13:26 +0300 |
|---|---|---|
| committer | Mihai Fufezan <[email protected]> | 2023-06-30 10:13:39 +0300 |
| commit | 64fc19cc811434b81ab9bc6b8c64edbcbfd0cfd4 (patch) | |
| tree | 5496392f73913cf956f6c85cc82b4bf7aeca5c18 /nix | |
| parent | 1012e2735a88188f43b11a9126e70977be1d2ab9 (diff) | |
| download | Hyprland-64fc19cc811434b81ab9bc6b8c64edbcbfd0cfd4.tar.gz Hyprland-64fc19cc811434b81ab9bc6b8c64edbcbfd0cfd4.zip | |
Nix/portals.patch: conditionally check portals
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/portals.patch | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nix/portals.patch b/nix/portals.patch index 245886c4..4d426dd5 100644 --- a/nix/portals.patch +++ b/nix/portals.patch @@ -1,15 +1,18 @@ diff --git a/src/Compositor.cpp b/src/Compositor.cpp -index a9d95f39..6aa8e7d6 100644 +index a9d95f39..069a03ca 100644 --- a/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 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"); })) { ++ 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"); })) { // bad portal detected g_pHyprNotificationOverlay->addNotification("You have one or more incompatible xdg-desktop-portal impls installed. Please remove incompatible ones to avoid issues.", |