[bug#35470] [PATCH] services: slim: Honor the value of slim from slim-configuration.

[bug#35470] [PATCH] services: slim: Honor the value of slim from slim-configuration.

[Diego Nicola Barbato]

[-- Attachment #1: Type: text/plain, Size: 148 bytes --]

Hi Guix,

I have noticed that setting the slim field in slim-configuration does
not have any effect.  This patch should fix that.

Regards,

Diego


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-services-slim-Honor-the-value-of-slim-from-slim-conf.patch --]
[-- Type: text/x-patch, Size: 1732 bytes --]

From 85c4a2764baba987d1ddd4dd67f7d33f9e49e9ea Mon Sep 17 00:00:00 2001
From: Diego Nicola Barbato <dnbarbato@posteo.de>
Date: Sat, 27 Apr 2019 19:45:47 +0200
Subject: [PATCH] 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.
---
 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 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
-- 
2.21.0

bug#35470: [PATCH] services: slim: Honor the value of slim from slim-configuration.

[Ludovic Courtès]

Hi,

Diego Nicola Barbato <dnbarbato@posteo.de> skribis:

>>From 85c4a2764baba987d1ddd4dd67f7d33f9e49e9ea Mon Sep 17 00:00:00 2001
> From: Diego Nicola Barbato <dnbarbato@posteo.de>
> Date: Sat, 27 Apr 2019 19:45:47 +0200
> Subject: [PATCH] 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.

Good catch.  Applied, thanks!

Ludo’.