mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-14 20:45:58 +01:00
aff4a1e237
It seems that, on NixOS at least, having both the Hyprland and the wlr desktop portals does not result in unexpected behaviour. xdph will be started and wlr ignored.
28 lines
1.7 KiB
Diff
28 lines
1.7 KiB
Diff
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
|
|
index 1d978aed..56665389 100644
|
|
--- a/src/Compositor.cpp
|
|
+++ b/src/Compositor.cpp
|
|
@@ -2365,17 +2365,16 @@ void CCompositor::performUserChecks() {
|
|
|
|
static auto* const PSUPPRESSPORTAL = &g_pConfigManager->getConfigValuePtr("misc:suppress_portal_warnings")->intValue;
|
|
|
|
- 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.",
|
|
CColor(0), 15000, ICON_ERROR);
|
|
}
|
|
-
|
|
- if (std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/hyprland.portal") && std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/wlr.portal")) {
|
|
- g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0),
|
|
- 15000, ICON_ERROR);
|
|
- }
|
|
}
|
|
}
|
|
|