diff options
| author | Vaxry <[email protected]> | 2023-08-26 17:12:21 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-26 17:12:21 +0200 |
| commit | 4a41d013a27c9919ed41a50c43c4224d8443a415 (patch) | |
| tree | f404e8d5d70d48dac21dcca836cfd8310f873335 /nix | |
| parent | 299d201e562c0d0d1530d1559ff33802a1470815 (diff) | |
| download | Hyprland-4a41d013a27c9919ed41a50c43c4224d8443a415.tar.gz Hyprland-4a41d013a27c9919ed41a50c43c4224d8443a415.zip | |
internal: Fix XDP multi-portal issues (#3077)
* add a hyprland portals conf
* remove portal checks
* typo
* Nix: remove portal patch
---------
Co-authored-by: Mihai Fufezan <[email protected]>
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default.nix | 2 | ||||
| -rw-r--r-- | nix/patches/portals.patch | 28 |
2 files changed, 0 insertions, 30 deletions
diff --git a/nix/default.nix b/nix/default.nix index 663d5429..96fa12d7 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -100,8 +100,6 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov patches = [ # make meson use the provided wlroots instead of the git submodule ./patches/meson-build.patch - # fixes portals search path to be picked up from $XDG_DESKTOP_PORTAL_DIR - ./patches/portals.patch ]; postPatch = '' diff --git a/nix/patches/portals.patch b/nix/patches/portals.patch deleted file mode 100644 index cb3d97c3..00000000 --- a/nix/patches/portals.patch +++ /dev/null @@ -1,28 +0,0 @@ -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); -- } - } - } - |