nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: xorg: Remove unused #:guile parameter. 

* gnu/services/xorg.scm (xorg-wrapper): Remove #:guile, which was unused.
(xorg-start-command): Likewise.
(xinitrc): Likewise.
This commit is contained in:
Ludovic Courtès 2019-03-18 21:52:18 +01:00
parent 8d058e7b1b
commit 956607e340
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guix.texi
View File

@ -13352,7 +13352,7 @@ type @code{<sddm-configuration>}.
@end example @end example
@end deffn @end deffn
@deffn {Scheme Procedure} xorg-start-command [#:guile] @ @deffn {Scheme Procedure} xorg-start-command @
[#:modules %default-xorg-modules] @ [#:modules %default-xorg-modules] @
[#:fonts %default-xorg-fonts] @ [#:fonts %default-xorg-fonts] @
[#:configuration-file (xorg-configuration-file @dots{})] @ [#:configuration-file (xorg-configuration-file @dots{})] @

9
gnu/services/xorg.scm
View File

@ -261,7 +261,6 @@ in @var{modules}."
#t)))) #t))))
(define* (xorg-wrapper #:key (define* (xorg-wrapper #:key
(guile (canonical-package guile-2.0))
(modules %default-xorg-modules) (modules %default-xorg-modules)
(configuration-file (xorg-configuration-file (configuration-file (xorg-configuration-file
#:modules modules)) #:modules modules))
@ -287,7 +286,6 @@ in place of @code{/usr/bin/X}."
(program-file "X-wrapper" exp)) (program-file "X-wrapper" exp))
(define* (xorg-start-command #:key (define* (xorg-start-command #:key
(guile (canonical-package guile-2.0))
(modules %default-xorg-modules) (modules %default-xorg-modules)
(fonts %default-xorg-fonts) (fonts %default-xorg-fonts)
(configuration-file (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 @code{xorg-wrapper} for more details on the arguments. The result should be
used in place of @code{startx}." used in place of @code{startx}."
(define X (define X
(xorg-wrapper #:guile guile (xorg-wrapper #:configuration-file configuration-file
#:configuration-file configuration-file
#:modules modules #:modules modules
#:xorg-server xorg-server)) #:xorg-server xorg-server))
(define exp (define exp
@ -312,9 +309,7 @@ used in place of @code{startx}."
(program-file "startx" exp)) (program-file "startx" exp))
(define* (xinitrc #:key (define* (xinitrc #:key fallback-session)
(guile (canonical-package guile-2.0))
fallback-session)
"Return a system-wide xinitrc script that starts the specified X 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 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 @var{fallback-session} will be used or, if @var{fallback-session} is false, a