nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-07 04:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
K900 2024-10-04 18:29:33 +03:00 committed by GitHub
commit d5f1752ca9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -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);

4
nixos/modules/services/x11/desktop-managers/deepin.nix
View File

@ -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

5
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -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 ];

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

@ -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 ];