diff options
| author | Diego Nicola Barbato <dnbarbato@posteo.de> | 2019-04-27 19:45:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-04-29 09:33:55 +0200 |
| commit | b901b72545ba780741113519a10a11ea6d69e42d (patch) | |
| tree | a6767f3d2101cf12ff349edf43ed37815ea3cc8d | |
| parent | fdb513a7045f9731ddffff23bc8fb78b012d58ce (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>
| -rw-r--r-- | gnu/services/xorg.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index d4e73c13b46..44dcec4ec90 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." | |||
| 502 | (define slim.cfg | 502 | (define slim.cfg |
| 503 | (let ((xinitrc (xinitrc #:fallback-session | 503 | (let ((xinitrc (xinitrc #:fallback-session |
| 504 | (slim-configuration-auto-login-session config))) | 504 | (slim-configuration-auto-login-session config))) |
| 505 | (slim (slim-configuration-slim config)) | ||
| 506 | (xauth (slim-configuration-xauth config)) | 505 | (xauth (slim-configuration-xauth config)) |
| 507 | (startx (xorg-start-command (slim-configuration-xorg config))) | 506 | (startx (xorg-start-command (slim-configuration-xorg config))) |
| 508 | (shepherd (slim-configuration-shepherd config)) | 507 | (shepherd (slim-configuration-shepherd config)) |
| @@ -547,7 +546,9 @@ reboot_cmd " shepherd "/sbin/reboot\n" | |||
| 547 | (false-if-exception (delete-file "/var/run/slim.lock")) | 546 | (false-if-exception (delete-file "/var/run/slim.lock")) |
| 548 | 547 | ||
| 549 | (fork+exec-command | 548 | (fork+exec-command |
| 550 | (list (string-append #$slim "/bin/slim") "-nodaemon") | 549 | (list (string-append #$(slim-configuration-slim config) |
| 550 | "/bin/slim") | ||
| 551 | "-nodaemon") | ||
| 551 | #:environment-variables | 552 | #:environment-variables |
| 552 | (list (string-append "SLIM_CFGFILE=" #$slim.cfg) | 553 | (list (string-append "SLIM_CFGFILE=" #$slim.cfg) |
| 553 | #$@(if theme | 554 | #$@(if theme |
