diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-10-15 08:27:51 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-10-15 08:27:51 +0000 |
| commit | 6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39 (patch) | |
| tree | 67bc4242af26f6f824ba4bd60078aa8d93df7d5b /modules/services/x11/display-managers/default.nix | |
| parent | f3472f7163e134af7a656a77a84259e31328b17a (diff) | |
| download | nixpkgs-6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39.tar nixpkgs-6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39.tar.gz nixpkgs-6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39.tar.bz2 nixpkgs-6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39.tar.lz nixpkgs-6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39.tar.xz nixpkgs-6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39.tar.zst nixpkgs-6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39.zip | |
X11: Always honor ~/.xsession.
See http://thread.gmane.org/gmane.linux.distributions.nixos/2879 . svn path=/nixos/trunk/; revision=17814
Diffstat (limited to 'modules/services/x11/display-managers/default.nix')
| -rw-r--r-- | modules/services/x11/display-managers/default.nix | 9 |
1 files 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 |