From d6e87f17497a0aa577608a8e33eb8677a9dc461e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 7 Nov 2014 21:21:21 +0100
Subject: Try to load Xresources, if that fails fall back to Xdefaults. Closes
 #4670

---
 nixos/modules/services/x11/display-managers/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nixos')

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 899c5a91fb33..6b01cde9e2b4 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -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
 
-- 
cgit 1.4.1