diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-07 04:39:25 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-07 04:39:25 -0500 |
| commit | 4b28d9d9349ad9b0cfabe981fd453afcf8cb8360 (patch) | |
| tree | 88b473f62eae53502807031597ffc146ab7826e8 /nixos | |
| parent | 5dcb18610aaf1ee9a2b853a01a6a7c521f3747a0 (diff) | |
| parent | c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f (diff) | |
| download | nixlib-4b28d9d9349ad9b0cfabe981fd453afcf8cb8360.tar nixlib-4b28d9d9349ad9b0cfabe981fd453afcf8cb8360.tar.gz nixlib-4b28d9d9349ad9b0cfabe981fd453afcf8cb8360.tar.bz2 nixlib-4b28d9d9349ad9b0cfabe981fd453afcf8cb8360.tar.lz nixlib-4b28d9d9349ad9b0cfabe981fd453afcf8cb8360.tar.xz nixlib-4b28d9d9349ad9b0cfabe981fd453afcf8cb8360.tar.zst nixlib-4b28d9d9349ad9b0cfabe981fd453afcf8cb8360.zip | |
Merge branch 'desktopmanager-fix' of git://github.com/pSub/nixpkgs
Use feh only as a fallback if the xserver is actually enabled.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/default.nix | 6 |
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 707507706633..dde5b333f329 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 |