summaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-11-06 23:20:53 +0100
committerLudovic Courtès <ludo@gnu.org>2014-11-07 00:00:08 +0100
commitf703413e41d7cdfbffef841bc03826175cbe71a3 (patch)
treea39aa283b91bea11dac65e30d0879028e0d9f5e9 /gnu/services
parente30442b53b6328a45d91ce9ef8e9d3d29ff2a5a9 (diff)
services: xorg: Allow users to specify the drivers to use.
* gnu/services/xorg.scm (xorg-start-command): Add #:drivers parameter. Add 'device-section' procedure, and use it in 'xserver.conf'. * doc/guix.texi (X Window): Document it.
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/xorg.scm21
1 files changed, 17 insertions, 4 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 6be94d5614..41e05c9c17 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -42,9 +42,21 @@
(define* (xorg-start-command #:key
(guile (canonical-package guile-2.0))
- (xorg-server xorg-server))
- "Return a derivation that builds a GUILE script to start the X server from
-XORG-SERVER. Usually the X server is started by a login manager."
+ (xorg-server xorg-server)
+ (drivers '()))
+ "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.
+
+@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\")}."
+
+ (define (device-section driver)
+ (string-append "
+Section \"Device\"
+ Identifier \"device-" driver "\"
+ Driver \"" driver "\"
+EndSection"))
(define (xserver.conf)
(text-file* "xserver.conf" "
@@ -69,7 +81,8 @@ EndSection
Section \"ServerFlags\"
Option \"AllowMouseOpenFail\" \"on\"
EndSection
-"))
+"
+ (string-join (map device-section drivers) "\n")))
(mlet %store-monad ((config (xserver.conf)))
(define script