diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index cd5c9e1c948f..7f824680b92e 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -192,10 +192,7 @@ in xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-xapp - (pkgs.xdg-desktop-portal-gtk.override { - # Do not build portals that we already have. - buildPortalsInGnome = false; - }) + pkgs.xdg-desktop-portal-gtk ]; services.orca.enable = mkDefault (notExcluded pkgs.orca); diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 70149bcf4ae0..4829990acc4f 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -74,9 +74,7 @@ in xdg.icons.enable = true; xdg.portal.enable = mkDefault true; xdg.portal.extraPortals = mkDefault [ - (pkgs.xdg-desktop-portal-gtk.override { - buildPortalsInGnome = false; - }) + pkgs.xdg-desktop-portal-gtk ]; # https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259 diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index bb2ce03e73a3..372300f34950 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -281,10 +281,7 @@ in xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gnome - (pkgs.xdg-desktop-portal-gtk.override { - # Do not build portals that we already have. - buildPortalsInGnome = false; - }) + pkgs.xdg-desktop-portal-gtk ]; xdg.portal.configPackages = mkDefault [ pkgs.gnome-session ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index a1d01682f22e..db06dc756248 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -11,7 +11,6 @@ , glib , wrapGAppsHook3 , gsettings-desktop-schemas -, buildPortalsInGnome ? true }: stdenv.mkDerivation (finalAttrs: { @@ -36,19 +35,11 @@ stdenv.mkDerivation (finalAttrs: { glib gtk3 xdg-desktop-portal - ] ++ lib.optionals buildPortalsInGnome [ gsettings-desktop-schemas # settings exposed by settings portal gnome-desktop gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings) ]; - mesonFlags = lib.optionals (!buildPortalsInGnome) [ - "-Dwallpaper=disabled" - "-Dsettings=disabled" - "-Dappchooser=disabled" - "-Dlockdown=disabled" - ]; - meta = with lib; { description = "Desktop integration portals for sandboxed apps"; maintainers = with maintainers; [ jtojnar ];