talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

xfce.xfce4-screensaver: 4.18.3 -> 4.18.4

Browse Source 
https://gitlab.xfce.org/apps/xfce4-screensaver/-/compare/xfce4-screensaver-4.18.3...xfce4-screensaver-4.18.4

* This now exits early on Wayland sessions.
* xfdesktop no longer does `xfce_workspace_migrate_backdrop_image` so we need to take care missing last-image.
This commit is contained in:
Bobby Rong 2024-12-21 08:59:16 +00:00
parent d3c42f1871
commit 4debaffa6b
No known key found for this signature in database
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/xfce-wayland.nix
View File

@ -23,8 +23,6 @@ import ./make-test-python.nix (
services.xserver.desktopManager.xfce.enable = true; services.xserver.desktopManager.xfce.enable = true;
services.xserver.desktopManager.xfce.enableWaylandSession = true; services.xserver.desktopManager.xfce.enableWaylandSession = true;
# https://gitlab.xfce.org/apps/xfce4-screensaver/-/merge_requests/28
services.xserver.desktopManager.xfce.enableScreensaver = false;
environment.systemPackages = [ pkgs.wlrctl ]; environment.systemPackages = [ pkgs.wlrctl ];
}; };

10
pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix
View File

@ -16,6 +16,7 @@
python3, python3,
systemd, systemd,
xfconf, xfconf,
xfdesktop,
lib, lib,
}: }:
@ -26,9 +27,9 @@ in
mkXfceDerivation { mkXfceDerivation {
category = "apps"; category = "apps";
pname = "xfce4-screensaver"; pname = "xfce4-screensaver";
version = "4.18.3"; version = "4.18.4";
sha256 = "sha256-hOhWJoiKoeRgkhXaR8rnDpcJpStMD4BBdll4nwSA+EQ="; sha256 = "sha256-vkxkryi7JQg1L/JdWnO9qmW6Zx6xP5Urq4kXMe7Iiyc=";
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection gobject-introspection
@ -56,6 +57,11 @@ mkXfceDerivation {
makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ]; makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ];
preFixup = ''
# For default wallpaper.
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${xfdesktop}/share")
'';
meta = with lib; { meta = with lib; {
description = "Screensaver for Xfce"; description = "Screensaver for Xfce";
maintainers = with maintainers; [ symphorien ] ++ teams.xfce.members; maintainers = with maintainers; [ symphorien ] ++ teams.xfce.members;