GNU bug report logs - #34929
[PATCH 00/12] Provide uniform keyboard layout configuration

Previous Next

Full log

Message #20 received at 34929 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: 34929 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH 05/12] services: xorg: Remove unused #:guile parameter.
Date: Thu, 21 Mar 2019 00:04:28 +0100

* gnu/services/xorg.scm (xorg-wrapper): Remove #:guile, which was unused.
(xorg-start-command): Likewise.
(xinitrc): Likewise.
---
 doc/guix.texi         | 2 +-
 gnu/services/xorg.scm | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index c687f78eac..622740b11c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13310,7 +13310,7 @@ type @code{<sddm-configuration>}.
 @end example
 @end deffn
 
-@deffn {Scheme Procedure} xorg-start-command [#:guile] @
+@deffn {Scheme Procedure} xorg-start-command @
   [#:modules %default-xorg-modules] @
   [#:fonts %default-xorg-fonts] @
   [#:configuration-file (xorg-configuration-file @dots{})] @
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index f2a3c28c90..8381a7ed04 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -261,7 +261,6 @@ in @var{modules}."
                        #t))))
 
 (define* (xorg-wrapper #:key
-                       (guile (canonical-package guile-2.0))
                        (modules %default-xorg-modules)
                        (configuration-file (xorg-configuration-file
                                             #:modules modules))
@@ -287,7 +286,6 @@ in place of @code{/usr/bin/X}."
   (program-file "X-wrapper" exp))
 
 (define* (xorg-start-command #:key
-                             (guile (canonical-package guile-2.0))
                              (modules %default-xorg-modules)
                              (fonts %default-xorg-fonts)
                              (configuration-file
@@ -300,8 +298,7 @@ packages, and @var{fonts}, a list of X font directories, are available.  See
 @code{xorg-wrapper} for more details on the arguments.  The result should be
 used in place of @code{startx}."
   (define X
-    (xorg-wrapper #:guile guile
-                  #:configuration-file configuration-file
+    (xorg-wrapper #:configuration-file configuration-file
                   #:modules modules
                   #:xorg-server xorg-server))
   (define exp
@@ -312,9 +309,7 @@ used in place of @code{startx}."
 
   (program-file "startx" exp))
 
-(define* (xinitrc #:key
-                  (guile (canonical-package guile-2.0))
-                  fallback-session)
+(define* (xinitrc #:key fallback-session)
   "Return a system-wide xinitrc script that starts the specified X session,
 which should be passed to this script as the first argument.  If not, the
 @var{fallback-session} will be used or, if @var{fallback-session} is false, a
-- 
2.21.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.