From aff4a1e237e6270e19b51731046fa9b8af6d313b Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sat, 5 Aug 2023 12:46:50 +0300 Subject: [PATCH] Nix: don't warn against xdpw and xdph being present 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. --- nix/patches/portals.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/nix/patches/portals.patch b/nix/patches/portals.patch index 4d426dd5..cb3d97c3 100644 --- a/nix/patches/portals.patch +++ b/nix/patches/portals.patch @@ -1,8 +1,8 @@ diff --git a/src/Compositor.cpp b/src/Compositor.cpp -index a9d95f39..069a03ca 100644 +index 1d978aed..56665389 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp -@@ -2340,14 +2340,18 @@ void CCompositor::performUserChecks() { +@@ -2365,17 +2365,16 @@ void CCompositor::performUserChecks() { static auto* const PSUPPRESSPORTAL = &g_pConfigManager->getConfigValuePtr("misc:suppress_portal_warnings")->intValue; @@ -18,9 +18,11 @@ index a9d95f39..069a03ca 100644 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")) { -+ if (std::filesystem::exists(PORTALDIR + "/hyprland.portal") && std::filesystem::exists(PORTALDIR + "/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); - } +- g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0), +- 15000, ICON_ERROR); +- } + } + } +