summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2014-03-04 09:10:23 +0100
committerPascal Wittmann <mail@pascal-wittmann.de>2014-03-04 09:10:23 +0100
commitc2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f (patch)
treedc017869ac67c74887d7ce143f84f702440e52e0 /nixos
parentc4d5757e294b9e894fc6781a04d546cff6e1da82 (diff)
downloadnixpkgs-c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f.tar
nixpkgs-c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f.tar.gz
nixpkgs-c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f.tar.bz2
nixpkgs-c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f.tar.lz
nixpkgs-c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f.tar.xz
nixpkgs-c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f.tar.zst
nixpkgs-c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f.zip
Use feh only as a fallback if the xserver is actually enabled.
Otherwise feh is installed even though no xserver is available.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 70750770663..dde5b333f32 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -7,9 +7,9 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager;
 
-  # Whether desktop manager `d' is capable of setting a background.
-  # If it isn't, the `feh' program is used as a fallback.
-  needBGCond = d: ! (d ? bgSupport && d.bgSupport);
+  # If desktop manager `d' isn't capable of setting a background and
+  # the xserver is enabled, the `feh' program is used as a fallback.
+  needBGCond = d: ! (d ? bgSupport && d.bgSupport) && xcfg.enable;
 
 in