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:
commit
4b28d9d934
@ -7,9 +7,9 @@ let
|
|||||||
xcfg = config.services.xserver;
|
xcfg = config.services.xserver;
|
||||||
cfg = xcfg.desktopManager;
|
cfg = xcfg.desktopManager;
|
||||||
|
|
||||||
# Whether desktop manager `d' is capable of setting a background.
|
# If desktop manager `d' isn't capable of setting a background and
|
||||||
# If it isn't, the `feh' program is used as a fallback.
|
# the xserver is enabled, the `feh' program is used as a fallback.
|
||||||
needBGCond = d: ! (d ? bgSupport && d.bgSupport);
|
needBGCond = d: ! (d ? bgSupport && d.bgSupport) && xcfg.enable;
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user