From 1c6b445b40dd693e9c2741942156258a89ebdb8b Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 7 Jul 2014 23:58:02 +0200
Subject: services: Update to use the dmd 0.2 API.

* gnu/services/avahi.scm (avahi-service)[start]: Wrap command in a
  list.
* gnu/services/dbus.scm (dbus-service)[start]: Likewise.
* gnu/services/ssh.scm (lsh-service): Likewise.
* gnu/services/base.scm (mingetty-service)[start]: Likewise.
  (nscd-service)[start]: Likewise.
  (syslog-service)[start]: Likewise.
  (guix-service)[start]: Likewise.
  (udev-service)[start]: Use 'exec-command' instead of 'execl'.
* gnu/services/xorg.scm (slim-service)[start]: Likewise, and use
  #:environment-variables.
---
 gnu/services/xorg.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'gnu/services/xorg.scm')

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 7215297f69..5eae4a87d8 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -163,11 +163,10 @@ (define (slim.cfg)
       (provision '(xorg-server))
       (requirement '(user-processes host-name))
       (start
-       ;; XXX: Work around the inability to specify env. vars. directly.
        #~(make-forkexec-constructor
-          (string-append #$bash "/bin/sh") "-c"
-          (string-append "SLIM_CFGFILE=" #$slim.cfg
-                         " " #$slim "/bin/slim" " -nodaemon")))
+          (list (string-append #$slim "/bin/slim") "-nodaemon")
+          #:environment-variables
+          (list (string-append "SLIM_CFGFILE=" #$slim.cfg))))
       (stop #~(make-kill-destructor))
       (respawn? #t)
       (pam-services
-- 
cgit v1.2.3