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

@@ -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