about summary refs log tree commit diff
path: root/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-09-06 22:46:05 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-09-06 22:46:05 +0200
commit66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (patch)
treefa53c32dfef1265496170172a28a3c71bb32a655 /nixos/modules/services/x11/desktop-managers/xfce4-14.nix
parentf9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (diff)
parentcfe51be04f8b7c36fe9f71ca5835bd683ede087f (diff)
downloadnixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar
nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.gz
nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.bz2
nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.lz
nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.xz
nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.zst
nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.zip
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/xfce4-14.nix')
-rw-r--r--nixos/modules/services/x11/desktop-managers/xfce4-14.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
index 55c88223e788..57d1268d655a 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -137,8 +137,7 @@ in
     services.gvfs.enable = true;
     services.gvfs.package = pkgs.xfce.gvfs;
     services.tumbler.enable = true;
-    services.dbus.packages =
-      optional config.services.printing.enable pkgs.system-config-printer;
+    services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
     services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
 
     # Enable default programs