hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-25 23:46:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Nix: don't warn against xdpw and xdph being present

Browse source 
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.
This commit is contained in:
Mihai Fufezan 2023-08-05 12:46:50 +03:00 committed by Mihai Fufezan
parent 2650224c1f
commit aff4a1e237
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nix/patches/portals.patch
View file

@ -1,8 +1,8 @@
diff --git a/src/Compositor.cpp b/src/Compositor.cpp diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index a9d95f39..069a03ca 100644 index 1d978aed..56665389 100644
--- a/src/Compositor.cpp --- a/src/Compositor.cpp
+++ b/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; 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.", 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); 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("/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),
g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0), - 15000, ICON_ERROR);
15000, ICON_ERROR); - }
} }
}