diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-05-21 18:02:01 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-21 21:33:18 +0200 |
commit | d1cdd7ba7a7bf6d0ea2ea5466d4bc978586f1f2f (patch) | |
tree | 085e1b873422bdacacf2b9bc6c9bfc01fab01038 /doc | |
parent | a4b1a6b65e0f01056bb41e51bddadc7fed923a14 (diff) | |
download | gnu-guix-d1cdd7ba7a7bf6d0ea2ea5466d4bc978586f1f2f.tar gnu-guix-d1cdd7ba7a7bf6d0ea2ea5466d4bc978586f1f2f.tar.gz |
services: xorg: Make 'xorg-configuration-file' public.
* gnu/services/xorg.scm (xorg-configuration-file): New procedure, with code
formerly in 'xorg-start-command'.
(xorg-start-command): Remove #:drivers and #:resolutions; add
#:configuration-file; use it as well as 'xorg-configuration-file'.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/guix.texi | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 2e245bfcf9..36e68bbe9a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5250,13 +5250,23 @@ The G-Expression denoting the default SLiM theme and its name. @end defvr @deffn {Monadic Procedure} xorg-start-command [#:guile] @ - [#:drivers '()] [#:resolutions '()] [#:xorg-server @var{xorg-server}] + [#:configuration-file #f] [#:xorg-server @var{xorg-server}] Return a derivation that builds a @var{guile} script to start the X server -from @var{xorg-server}. Usually the X server is started by a login manager. +from @var{xorg-server}. @var{configuration-file} is the server configuration +file or a derivation that builds it; when omitted, the result of +@code{xorg-configuration-file} is used. + +Usually the X server is started by a login manager. +@end deffn + +@deffn {Monadic Procedure} xorg-configuration-file @ + [#:drivers '()] [#:resolutions '()] +Return a configuration file for the Xorg server containing search paths for +all the common drivers. @var{drivers} must be either the empty list, in which case Xorg chooses a graphics driver automatically, or a list of driver names that will be tried in -this order---e.g., @code{("modesetting" "vesa")}. +this order---e.g., @code{(\"modesetting\" \"vesa\")}. Likewise, when @var{resolutions} is the empty list, Xorg chooses an appropriate screen resolution; otherwise, it must be a list of |