01/02: services: xorg: Assume STARTX is a regular value.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 1eca6c36adc00d88e6f29744aa2402f2a006be04
Author: Ludovic Courtès <address@hidden>
Date:   Thu May 21 22:22:12 2015 +0200

    services: xorg: Assume STARTX is a regular value.
    
    * gnu/services/xorg.scm (slim-service): Expect STARTX to be a regular value,
      not a monadic value.
---
 gnu/services/xorg.scm |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index e43bfcf..7c875a1 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -246,7 +246,9 @@ theme to use.  In that case, @var{theme-name} specifies the 
name of the
 theme."
 
   (define (slim.cfg)
-    (mlet %store-monad ((startx  (or startx (xorg-start-command)))
+    (mlet %store-monad ((startx  (if startx
+                                     (return startx)
+                                     (xorg-start-command)))
                         (xinitrc (xinitrc #:fallback-session
                                           auto-login-session)))
       (text-file* "slim.cfg"  "