From 6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 15 Oct 2009 08:27:51 +0000
Subject: [PATCH] X11: Always honor ~/.xsession.

See http://thread.gmane.org/gmane.linux.distributions.nixos/2879 .

svn path=/nixos/trunk/; revision=17814
---
 modules/services/x11/display-managers/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 398996bd7c6..f62c38bf711 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -57,9 +57,12 @@ let
       source /etc/profile
 
       # Allow the user to setup a custom session type.
-      if test "$sessionType" = custom; then
-          test -x ~/.xsession && exec ~/.xsession
-          sessionType="" # fall-thru if there is no ~/.xsession
+      if test -x ~/.xsession; then
+          exec ~/.xsession
+      else
+          if test "$sessionType" = "custom"; then
+              sessionType="" # fall-thru if there is no ~/.xsession
+          fi
       fi
 
       # The session type is "<desktop-manager> + <window-manager>", so