diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 57fd8d7a7c40..941f06ae6edf 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -244,6 +244,17 @@ in security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver; + xdg.portal.enable = mkDefault true; + xdg.portal.extraPortals = utils.removePackagesByName ( + with pkgs; + [ + xdg-desktop-portal-gtk + xdg-desktop-portal-xapp + ] + ++ lib.optionals cfg.enableWaylandSession [ + xdg-desktop-portal-wlr + ] + ) excludePackages; xdg.portal.configPackages = mkDefault [ pkgs.xfce4-session ]; }; } diff --git a/pkgs/by-name/li/libxfce4windowing/package.nix b/pkgs/by-name/li/libxfce4windowing/package.nix index 8e82630e099f..6fe9f0e87a82 100644 --- a/pkgs/by-name/li/libxfce4windowing/package.nix +++ b/pkgs/by-name/li/libxfce4windowing/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxfce4windowing"; - version = "4.20.4"; + version = "4.20.5"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "xfce"; repo = "libxfce4windowing"; tag = "libxfce4windowing-${finalAttrs.version}"; - hash = "sha256-8iLkljuGyJ4giVN5yuOFuTZsrdr8U3avTS/1aRSpaxc="; + hash = "sha256-TVu6S/Cip9IqniAvrTU5uSs7Dgm0WZNxjgB4vjHvBNU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xf/xfce4-panel/package.nix b/pkgs/by-name/xf/xfce4-panel/package.nix index 1b9a92bd8fc0..6e44474b825d 100644 --- a/pkgs/by-name/xf/xfce4-panel/package.nix +++ b/pkgs/by-name/xf/xfce4-panel/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "xfce4-panel"; - version = "4.20.5"; + version = "4.20.6"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "xfce"; repo = "xfce4-panel"; tag = "xfce4-panel-${finalAttrs.version}"; - hash = "sha256-Jftj+EmmsKfK9jk8rj5uMjpteFUHFgOpoEol8JReDNI="; + hash = "sha256-yfiF+ciuRNJzBt3n1rH2ywA1vNGYRVHu2ojf/EIGwyg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xf/xfce4-settings/package.nix b/pkgs/by-name/xf/xfce4-settings/package.nix index dbc5078e6499..9694bf28f248 100644 --- a/pkgs/by-name/xf/xfce4-settings/package.nix +++ b/pkgs/by-name/xf/xfce4-settings/package.nix @@ -24,6 +24,7 @@ # https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/222 withUpower ? false, wlr-protocols, + xapp, xfconf, xf86inputlibinput, colord, @@ -33,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "xfce4-settings"; - version = "4.20.2"; + version = "4.20.3"; src = fetchFromGitLab { domain = "gitlab.xfce.org"; owner = "xfce"; repo = "xfce4-settings"; tag = "xfce4-settings-${finalAttrs.version}"; - hash = "sha256-hx1ilXPcwWWDwNR/k2b+9vR5aCv9UlPR0d42OE6JxEk="; + hash = "sha256-dQyALVooaie2vkETghddKM4HqAZQmx3E9UJ+ChKtydc="; }; nativeBuildInputs = [ @@ -64,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: { libxfce4util libxklavier wlr-protocols + xapp # org.x.apps.portal xf86inputlibinput xfconf ]