02/03: services: xorg: Accept session commands with arguments.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit c510cbb4ecb270ca3edf282c6769aa2bfb144822
Author: Ludovic Courtès <address@hidden>
Date:   Fri Mar 18 19:37:34 2016 +0100

    services: xorg: Accept session commands with arguments.
    
    Before that, a session command with several items, such as
    'gnome-session --disable-acceleration-check', would trigger the fallback
    session.
    
    * gnu/services/xorg.scm (xinitrc)[builder]: Accept command lines with
    more than one arguments.
---
 gnu/services/xorg.scm |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 980b5a6..e16247b 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2015 Sou Bunnbu <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -246,13 +246,14 @@ which should be passed to this script as the first 
argument.  If not, the
         (let* ((home          (getenv "HOME"))
                (xsession-file (string-append home "/.xsession"))
                (session       (match (command-line)
-                                ((_ x) x)
-                                (_     #$fallback-session))))
+                                ((_)       (list #$fallback-session))
+                                ((_ x ..1) x))))
           (if (file-exists? xsession-file)
               ;; Run ~/.xsession when it exists.
               (exec-from-login-shell xsession-file session)
               ;; Otherwise, start the specified session.
-              (exec-from-login-shell session)))))
+              (apply exec-from-login-shell session)))))
+
   (program-file "xinitrc" builder))