Skip to content

Commit 4debaff

Browse files
committed
xfce.xfce4-screensaver: 4.18.3 -> 4.18.4
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.
1 parent d3c42f1 commit 4debaff

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

nixos/tests/xfce-wayland.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ import ./make-test-python.nix (
2323

2424
services.xserver.desktopManager.xfce.enable = true;
2525
services.xserver.desktopManager.xfce.enableWaylandSession = true;
26-
# https://gitlab.xfce.org/apps/xfce4-screensaver/-/merge_requests/28
27-
services.xserver.desktopManager.xfce.enableScreensaver = false;
2826
environment.systemPackages = [ pkgs.wlrctl ];
2927
};
3028

pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
python3,
1717
systemd,
1818
xfconf,
19+
xfdesktop,
1920
lib,
2021
}:
2122

@@ -26,9 +27,9 @@ in
2627
mkXfceDerivation {
2728
category = "apps";
2829
pname = "xfce4-screensaver";
29-
version = "4.18.3";
30+
version = "4.18.4";
3031

31-
sha256 = "sha256-hOhWJoiKoeRgkhXaR8rnDpcJpStMD4BBdll4nwSA+EQ=";
32+
sha256 = "sha256-vkxkryi7JQg1L/JdWnO9qmW6Zx6xP5Urq4kXMe7Iiyc=";
3233

3334
nativeBuildInputs = [
3435
gobject-introspection
@@ -56,6 +57,11 @@ mkXfceDerivation {
5657

5758
makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ];
5859

60+
preFixup = ''
61+
# For default wallpaper.
62+
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${xfdesktop}/share")
63+
'';
64+
5965
meta = with lib; {
6066
description = "Screensaver for Xfce";
6167
maintainers = with maintainers; [ symphorien ] ++ teams.xfce.members;

0 commit comments

Comments
 (0)