aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-21 22:22:12 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-21 22:22:12 +0200
commit1eca6c36adc00d88e6f29744aa2402f2a006be04 (patch)
treea02fbece6b1961319bc2f3f77e42c589ac59c94c
parent12422c9d3872f66c4eac5eb65824238c3e09be1a (diff)
downloadguix-1eca6c36adc00d88e6f29744aa2402f2a006be04.tar
guix-1eca6c36adc00d88e6f29744aa2402f2a006be04.tar.gz
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.
-rw-r--r--gnu/services/xorg.scm4
1 files changed, 3 insertions, 1 deletions
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" "