nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Diego Nicola Barbato 2019-04-27 19:45:47 +02:00 committed by Ludovic Courtès
parent fdb513a704
commit b901b72545
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/services/xorg.scm
View File

@ -502,7 +502,6 @@ desktop session from the system or user profile will be used."
(define slim.cfg (define slim.cfg
(let ((xinitrc (xinitrc #:fallback-session (let ((xinitrc (xinitrc #:fallback-session
(slim-configuration-auto-login-session config))) (slim-configuration-auto-login-session config)))
(slim (slim-configuration-slim config))
(xauth (slim-configuration-xauth config)) (xauth (slim-configuration-xauth config))
(startx (xorg-start-command (slim-configuration-xorg config))) (startx (xorg-start-command (slim-configuration-xorg config)))
(shepherd (slim-configuration-shepherd 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")) (false-if-exception (delete-file "/var/run/slim.lock"))
(fork+exec-command (fork+exec-command
(list (string-append #$slim "/bin/slim") "-nodaemon") (list (string-append #$(slim-configuration-slim config)
"/bin/slim")
"-nodaemon")
#:environment-variables #:environment-variables
(list (string-append "SLIM_CFGFILE=" #$slim.cfg) (list (string-append "SLIM_CFGFILE=" #$slim.cfg)
#$@(if theme #$@(if theme