diff --git a/modules/base/packages/default.nix b/modules/base/packages/default.nix index 1b9e9b69..4b5241f1 100644 --- a/modules/base/packages/default.nix +++ b/modules/base/packages/default.nix @@ -15,10 +15,9 @@ in { "nixpkgs-wayland" ]) ++ (attrValues { - inherit - (self.overlays) - xdg-desktop-portal-kde - ; + # inherit + # (self.overlays) + # ; }); environment.systemPackages = remove null (attrValues { diff --git a/overlays/xdg-desktop-portal-kde/6-3.patch b/overlays/xdg-desktop-portal-kde/6-3.patch deleted file mode 100644 index df308e44..00000000 --- a/overlays/xdg-desktop-portal-kde/6-3.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp -index 44ceebcf..8146df20 100644 ---- a/src/remotedesktop.cpp -+++ b/src/remotedesktop.cpp -@@ -22,6 +22,8 @@ - #include - #include - #include -+#include -+#include - #include - - #include "permission_store.h" -@@ -224,7 +226,10 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle, - notification->setIconName(QStringLiteral("krfb")); - notification->sendEvent(); - } else { -- if (!isAppMegaAuthorized(app_id)) { // authorize right away -+ auto cfg = KSharedConfig::openConfig(QStringLiteral("plasmaremotedesktoprc")); -+ const auto unattendedAccess = cfg->group("Sharing").readEntry("Unattended", false); -+ if (!unattendedAccess || !isAppMegaAuthorized(app_id)) // authorize right away -+ { - QScopedPointer remoteDesktopDialog( - new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled(), session->persistMode())); - Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window); - diff --git a/overlays/xdg-desktop-portal-kde/default.nix b/overlays/xdg-desktop-portal-kde/default.nix index bb4b637d..0cf4862f 100644 --- a/overlays/xdg-desktop-portal-kde/default.nix +++ b/overlays/xdg-desktop-portal-kde/default.nix @@ -7,9 +7,7 @@ then ./6-1-3.patch else if builtins.compareVersions o.version "6.3.0" == -1 then ./6-2.patch - # TODO: this patch is not necessary anymore - # https://develop.kde.org/docs/administration/portal-permissions/ - else ./6-3.patch; + else throw "This patch is not working or needed anymore. Please see https://develop.kde.org/docs/administration/portal-permissions/"; in (o.patches or []) ++ [