Unverified Commit d5f1752c authored by K900's avatar K900 Committed by GitHub
Browse files

xdg-desktop-portal-gtk: Enable all default portals unconditionally (#345979)

parents eae31bda 7f2a6f17

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+1 −4
Original line number Diff line number Diff line
@@ -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);

nixos/modules/services/x11/desktop-managers/deepin.nix

+1 −3
Original line number Diff line number Diff line
@@ -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

nixos/modules/services/x11/desktop-managers/gnome.nix

+1 −4
Original line number Diff line number Diff line
@@ -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 ];

pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix

+0 −9
Original line number Diff line number Diff line
@@ -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 ];