From 0c4a936419ca7c68bd6d0b5eb3d2292d421205b7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 1 Sep 2007 17:57:04 +0000
Subject: [PATCH] Added .xsession support

If user have ~/.xsession file it will be sourced.

svn path=/nixos/trunk/; revision=9231
---
 upstart-jobs/xserver.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 4d8e9e400e7..8181e7443df 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -133,6 +133,11 @@ let
       export SSH_ASKPASS=${x11_ssh_askpass}/libexec/x11-ssh-askpass
       eval $(${openssh}/bin/ssh-agent)
     " else ""}
+
+    ### Allow user to override system-wide configuration
+    if test -f ~/.xsession; then
+        source ~/.xsession;
+    fi
   
 
     ### Start a window manager.