Use feh only as a fallback if the xserver is actually enabled.
Otherwise feh is installed even though no xserver is available.
Merge branch 'desktopmanager-fix' of git://github.com/pSub/nixpkgs

Use feh only as a fallback if the xserver is actually enabled.