From c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 4 Mar 2014 09:10:23 +0100 Subject: [PATCH] Use feh only as a fallback if the xserver is actually enabled. Otherwise feh is installed even though no xserver is available. --- nixos/modules/services/x11/desktop-managers/default.nix | 6 +++--- 1 file 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