alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #4891 from pSub/prefer-xresources

Browse source 
Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
This commit is contained in:
Domen Kožar 2014-11-08 19:32:46 +01:00
parent fa1cec1037 d6e87f1749
commit 9ea81152cc
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/x11/display-managers/default.nix
View file

@ -79,7 +79,9 @@ let
''}
# Load X defaults.
if test -e ~/.Xdefaults; then
if test -e ~/.Xresources; then
${xorg.xrdb}/bin/xrdb -merge ~/.Xresources
elif test -e ~/.Xdefaults; then
${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
fi