summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorDiego Nicola Barbato <dnbarbato@posteo.de>2019-04-27 19:45:47 +0200
committerLudovic Courtès <ludo@gnu.org>2019-04-29 09:33:55 +0200
commitb901b72545ba780741113519a10a11ea6d69e42d (patch)
treea6767f3d2101cf12ff349edf43ed37815ea3cc8d /gnu
parentfdb513a7045f9731ddffff23bc8fb78b012d58ce (diff)
services: slim: Honor the value of slim from slim-configuration.
Previously setting the slim field in slim-configuration would have no effect. * gnu/services/xorg.scm (slim-shepherd-service): Remove unused let binding for slim. Use (slim-configuration-slim config) instead of the default slim. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/xorg.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index d4e73c13b4..44dcec4ec9 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -502,7 +502,6 @@ desktop session from the system or user profile will be used."
(define slim.cfg
(let ((xinitrc (xinitrc #:fallback-session
(slim-configuration-auto-login-session config)))
- (slim (slim-configuration-slim config))
(xauth (slim-configuration-xauth config))
(startx (xorg-start-command (slim-configuration-xorg config)))
(shepherd (slim-configuration-shepherd config))
@@ -547,7 +546,9 @@ reboot_cmd " shepherd "/sbin/reboot\n"
(false-if-exception (delete-file "/var/run/slim.lock"))
(fork+exec-command
- (list (string-append #$slim "/bin/slim") "-nodaemon")
+ (list (string-append #$(slim-configuration-slim config)
+ "/bin/slim")
+ "-nodaemon")
#:environment-variables
(list (string-append "SLIM_CFGFILE=" #$slim.cfg)
#$@(if theme