Merge branch 'desktopmanager-fix' of git://github.com/pSub/nixpkgs

Use feh only as a fallback if the xserver is actually enabled.
This commit is contained in:
Shea Levy 2014-03-07 04:39:25 -05:00
commit 4b28d9d934

View file

@ -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