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

gnu: services: Refactor to separate X and startx wrappers. 

* gnu/services/xorg.scm (xorg-wrapper): New public function.
(xorg-start-command): Use xorg-wrapper.
This commit is contained in:
Andy Wingo 2017-08-22 17:43:48 +02:00
parent 063c608261
commit 92753a8bad
No known key found for this signature in database
GPG Key ID: A8803732E4436885
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gnu/services/xorg.scm
View File

@ -1,4 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; ;;;
@ -41,6 +42,7 @@
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:export (xorg-configuration-file #:export (xorg-configuration-file
%default-xorg-modules %default-xorg-modules
xorg-wrapper
xorg-start-command xorg-start-command
xinitrc xinitrc
@ -184,36 +186,51 @@ in @var{modules}."
files) files)
#t)))) #t))))
(define* (xorg-start-command #:key (define* (xorg-wrapper #:key
(guile (canonical-package guile-2.0)) (guile (canonical-package guile-2.0))
(configuration-file (xorg-configuration-file)) (configuration-file (xorg-configuration-file))
(modules %default-xorg-modules) (modules %default-xorg-modules)
(xorg-server xorg-server)) (xorg-server xorg-server))
"Return a derivation that builds a @var{guile} script to start the X server "Return a derivation that builds a @var{guile} script to start the X server
from @var{xorg-server}. @var{configuration-file} is the server configuration from @var{xorg-server}. @var{configuration-file} is the server configuration
file or a derivation that builds it; when omitted, the result of file or a derivation that builds it; when omitted, the result of
@code{xorg-configuration-file} is used. @code{xorg-configuration-file} is used. The resulting script should be used
in place of @code{/usr/bin/X}."
Usually the X server is started by a login manager."
(define exp (define exp
;; Write a small wrapper around the X server. ;; Write a small wrapper around the X server.
#~(begin #~(begin
(setenv "XORG_DRI_DRIVER_PATH" (string-append #$mesa "/lib/dri")) (setenv "XORG_DRI_DRIVER_PATH" (string-append #$mesa "/lib/dri"))
(setenv "XKB_BINDIR" (string-append #$xkbcomp "/bin")) (setenv "XKB_BINDIR" (string-append #$xkbcomp "/bin"))
(apply execl (string-append #$xorg-server "/bin/X") (let ((X (string-append #$xorg-server "/bin/X")))
(string-append #$xorg-server "/bin/X") ;argv[0] (apply execl X X
"-logverbose" "-verbose" "-xkbdir" (string-append #$xkeyboard-config "/share/X11/xkb")
"-xkbdir" (string-append #$xkeyboard-config "/share/X11/xkb") "-config" #$configuration-file
"-config" #$configuration-file "-configdir" #$(xorg-configuration-directory modules)
"-configdir" #$(xorg-configuration-directory modules) (cdr (command-line))))))
"-nolisten" "tcp" "-terminate"
;; Note: SLiM and other display managers add the (program-file "X-wrapper" exp))
;; '-auth' flag by themselves.
(cdr (command-line)))))
(program-file "start-xorg" exp)) (define* (xorg-start-command #:key
(guile (canonical-package guile-2.0))
(configuration-file (xorg-configuration-file))
(modules %default-xorg-modules)
(xorg-server xorg-server))
"Return a derivation that builds a @code{startx} script in which a number of
X modules 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
#:modules modules
#:xorg-server xorg-server))
(define exp
;; Write a small wrapper around the X server.
#~(apply execl #$X #$X ;; Second #$X is for argv[0].
"-logverbose" "-verbose" "-nolisten" "tcp" "-terminate"
(cdr (command-line))))
(program-file "startx" exp))
(define* (xinitrc #:key (define* (xinitrc #:key
(guile (canonical-package guile-2.0)) (guile (canonical-package guile-2.0))