From 1eca6c36adc00d88e6f29744aa2402f2a006be04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 May 2015 22:22:12 +0200
Subject: [PATCH] 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 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index e43bfcffe0..7c875a1ae1 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"  "