[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/06: services: slim: Honor the value of slim from slim-configuration.
From: |
guix-commits |
Subject: |
01/06: services: slim: Honor the value of slim from slim-configuration. |
Date: |
Mon, 29 Apr 2019 04:17:52 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit b901b72545ba780741113519a10a11ea6d69e42d
Author: Diego Nicola Barbato <address@hidden>
Date: Sat Apr 27 19:45:47 2019 +0200
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 <address@hidden>
---
gnu/services/xorg.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index d4e73c1..44dcec4 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
- branch master updated (fdb513a -> d824cfb), guix-commits, 2019/04/29
- 01/06: services: slim: Honor the value of slim from slim-configuration.,
guix-commits <=
- 02/06: gnu: diffoscope: Update to 114., guix-commits, 2019/04/29
- 03/06: installer: Fix typo in docstring., guix-commits, 2019/04/29
- 04/06: gnu: Add font-public-sans., guix-commits, 2019/04/29
- 05/06: gnu: font-public-sans: Adjust synopsis and description., guix-commits, 2019/04/29
- 06/06: guix package: Add 'install', 'remove', and 'upgrade' aliases., guix-commits, 2019/04/29