073cd6092c
Includes fixes for CVE-2014-8091, CVE-2014-8092, CVE-2014-8093, CVE-2014-8094, CVE-2014-8095, CVE-2014-8096, CVE-2014-8097, CVE-2014-8098, CVE-2014-8099, CVE-2014-8100, CVE-2014-8101, CVE-2014-8102, and CVE-2014-8103. See <http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/> * gnu/packages/xorg.scm (xorg-server): Update to 1.16.2.901. Move mesa, resourceproto, scrnsaverproto, and xf86driproto from inputs to propagated-inputs. Add dri3proto and presentproto to propagated-inputs. Add eudev and libxshmfence to inputs. Add a 'pre-configure' phase instead of modifying the 'configure' phase. Adapt substitution that avoids trying to 'mkdir /var' to build system changes. * gnu/services/xorg.scm (xserver.conf): Add xf86-input-evdev ModulePath line.
290 lines
11 KiB
Scheme
290 lines
11 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
||
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
||
;;;
|
||
;;; This file is part of GNU Guix.
|
||
;;;
|
||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||
;;; under the terms of the GNU General Public License as published by
|
||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||
;;; your option) any later version.
|
||
;;;
|
||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
;;; GNU General Public License for more details.
|
||
;;;
|
||
;;; You should have received a copy of the GNU General Public License
|
||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||
|
||
(define-module (gnu services xorg)
|
||
#:use-module (gnu artwork)
|
||
#:use-module (gnu services)
|
||
#:use-module (gnu system linux) ; 'pam-service'
|
||
#:use-module ((gnu packages base) #:select (canonical-package))
|
||
#:use-module (gnu packages guile)
|
||
#:use-module (gnu packages xorg)
|
||
#:use-module (gnu packages gl)
|
||
#:use-module (gnu packages slim)
|
||
#:use-module (gnu packages ratpoison)
|
||
#:use-module (gnu packages gnustep)
|
||
#:use-module (gnu packages admin)
|
||
#:use-module (gnu packages bash)
|
||
#:use-module (guix gexp)
|
||
#:use-module (guix monads)
|
||
#:use-module (guix derivations)
|
||
#:use-module (srfi srfi-1)
|
||
#:use-module (srfi srfi-26)
|
||
#:use-module (ice-9 match)
|
||
#:export (xorg-start-command
|
||
%default-xsessions
|
||
%default-slim-theme
|
||
%default-slim-theme-name
|
||
slim-service))
|
||
|
||
;;; Commentary:
|
||
;;;
|
||
;;; Services that relate to the X Window System.
|
||
;;;
|
||
;;; Code:
|
||
|
||
(define* (xorg-start-command #:key
|
||
(guile (canonical-package guile-2.0))
|
||
(xorg-server xorg-server)
|
||
(drivers '()) (resolutions '()))
|
||
"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\")}.
|
||
|
||
Likewise, when @var{resolutions} is the empty list, Xorg chooses an
|
||
appropriate screen resolution; otherwise, it must be a list of
|
||
resolutions---e.g., @code{((1024 768) (640 480))}."
|
||
|
||
(define (device-section driver)
|
||
(string-append "
|
||
Section \"Device\"
|
||
Identifier \"device-" driver "\"
|
||
Driver \"" driver "\"
|
||
EndSection"))
|
||
|
||
(define (screen-section driver resolutions)
|
||
(string-append "
|
||
Section \"Screen\"
|
||
Identifier \"screen-" driver "\"
|
||
Device \"device-" driver "\"
|
||
SubSection \"Display\"
|
||
Modes "
|
||
(string-join (map (match-lambda
|
||
((x y)
|
||
(string-append "\"" (number->string x)
|
||
"x" (number->string y) "\"")))
|
||
resolutions)) "
|
||
EndSubSection
|
||
EndSection"))
|
||
|
||
(define (xserver.conf)
|
||
(text-file* "xserver.conf" "
|
||
Section \"Files\"
|
||
FontPath \"" font-adobe75dpi "/share/fonts/X11/75dpi\"
|
||
ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
|
||
ModulePath \"" xf86-video-fbdev "/lib/xorg/modules/drivers\"
|
||
ModulePath \"" xf86-video-modesetting "/lib/xorg/modules/drivers\"
|
||
ModulePath \"" xf86-video-cirrus "/lib/xorg/modules/drivers\"
|
||
ModulePath \"" xf86-video-intel "/lib/xorg/modules/drivers\"
|
||
ModulePath \"" xf86-video-mach64 "/lib/xorg/modules/drivers\"
|
||
ModulePath \"" xf86-video-nv "/lib/xorg/modules/drivers\"
|
||
ModulePath \"" xf86-video-sis "/lib/xorg/modules/drivers\"
|
||
ModulePath \"" xf86-input-evdev "/lib/xorg/modules/input\"
|
||
ModulePath \"" xf86-input-keyboard "/lib/xorg/modules/input\"
|
||
ModulePath \"" xf86-input-mouse "/lib/xorg/modules/input\"
|
||
ModulePath \"" xf86-input-synaptics "/lib/xorg/modules/input\"
|
||
ModulePath \"" xorg-server "/lib/xorg/modules\"
|
||
ModulePath \"" xorg-server "/lib/xorg/modules/extensions\"
|
||
ModulePath \"" xorg-server "/lib/xorg/modules/multimedia\"
|
||
EndSection
|
||
|
||
Section \"ServerFlags\"
|
||
Option \"AllowMouseOpenFail\" \"on\"
|
||
EndSection
|
||
"
|
||
(string-join (map device-section drivers) "\n")
|
||
(string-join (map (cut screen-section <> resolutions)
|
||
drivers)
|
||
"\n")))
|
||
|
||
(mlet %store-monad ((config (xserver.conf)))
|
||
(define script
|
||
;; Write a small wrapper around the X server.
|
||
#~(begin
|
||
(setenv "XORG_DRI_DRIVER_PATH" (string-append #$mesa "/lib/dri"))
|
||
(setenv "XKB_BINDIR" (string-append #$xkbcomp "/bin"))
|
||
|
||
(apply execl (string-append #$xorg-server "/bin/X")
|
||
(string-append #$xorg-server "/bin/X") ;argv[0]
|
||
"-logverbose" "-verbose"
|
||
"-xkbdir" (string-append #$xkeyboard-config "/share/X11/xkb")
|
||
"-config" #$config
|
||
"-nolisten" "tcp" "-terminate"
|
||
|
||
;; Note: SLiM and other display managers add the
|
||
;; '-auth' flag by themselves.
|
||
(cdr (command-line)))))
|
||
|
||
(gexp->script "start-xorg" script)))
|
||
|
||
(define* (xinitrc #:key
|
||
(guile (canonical-package guile-2.0))
|
||
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."
|
||
(define builder
|
||
#~(begin
|
||
(use-modules (ice-9 match))
|
||
|
||
(define (exec-from-login-shell command . args)
|
||
;; Run COMMAND from a login shell so that it gets to see the same
|
||
;; environment variables that one gets when logging in on a tty, for
|
||
;; instance.
|
||
(let* ((pw (getpw (getuid)))
|
||
(shell (passwd:shell pw))
|
||
(st (stat command #f)))
|
||
(when (and st (not (zero? (logand (stat:mode st) #o100))))
|
||
;; The '--login' option is supported at least by Bash and zsh.
|
||
(execl shell shell "--login" "-c"
|
||
(string-join (cons command args))))))
|
||
|
||
(let ((home (getenv "HOME"))
|
||
(session (match (command-line)
|
||
((_ x) x)
|
||
(_ #$fallback-session))))
|
||
;; First, try to run ~/.xsession.
|
||
(exec-from-login-shell (string-append home "/.xsession"))
|
||
;; Then try to start the specified session.
|
||
(exec-from-login-shell session))))
|
||
(gexp->script "xinitrc" builder))
|
||
|
||
|
||
;;;
|
||
;;; SLiM log-in manager.
|
||
;;;
|
||
|
||
(define %default-xsessions
|
||
;; Default xsessions available for log-in manager, representing as a list of
|
||
;; monadic desktop entries.
|
||
(list (text-file* "wmaker.desktop" "
|
||
[Desktop Entry]
|
||
Name=Window Maker
|
||
Exec=" windowmaker "/bin/wmaker
|
||
Type=Application
|
||
")
|
||
(text-file* "ratpoison.desktop" "
|
||
[Desktop Entry]
|
||
Name=Ratpoison
|
||
Exec=" ratpoison "/bin/ratpoison
|
||
Type=Application
|
||
")))
|
||
|
||
(define (xsessions-directory sessions)
|
||
"Return a directory containing SESSIONS, which should be a list of monadic
|
||
desktop entries."
|
||
(mlet %store-monad ((sessions (sequence %store-monad sessions)))
|
||
(define builder
|
||
#~(begin
|
||
(mkdir #$output)
|
||
(for-each (lambda (session)
|
||
(symlink session (string-append #$output "/"
|
||
(basename session))))
|
||
'#$sessions)))
|
||
(gexp->derivation "xsessions-dir" builder)))
|
||
|
||
(define %default-slim-theme
|
||
;; Theme based on work by Felipe López.
|
||
#~(string-append #$%artwork-repository "/slim"))
|
||
|
||
(define %default-slim-theme-name
|
||
;; This must be the name of the sub-directory in %DEFAULT-SLIM-THEME that
|
||
;; contains the actual theme files.
|
||
"0.8")
|
||
|
||
(define* (slim-service #:key (slim slim)
|
||
(allow-empty-passwords? #t) auto-login?
|
||
(default-user "")
|
||
(theme %default-slim-theme)
|
||
(theme-name %default-slim-theme-name)
|
||
(xauth xauth) (dmd dmd) (bash bash)
|
||
(sessions %default-xsessions)
|
||
(auto-login-session #~(string-append #$windowmaker
|
||
"/bin/wmaker"))
|
||
startx)
|
||
"Return a service that spawns the SLiM graphical login manager, which in
|
||
turn starts the X display server with @var{startx}, a command as returned by
|
||
@code{xorg-start-command}.
|
||
|
||
When @var{allow-empty-passwords?} is true, allow logins with an empty
|
||
password. When @var{auto-login?} is true, log in automatically as
|
||
@var{default-user} with @var{auto-login-session}.
|
||
|
||
If @var{theme} is @code{#f}, the use the default log-in theme; otherwise
|
||
@var{theme} must be a gexp denoting the name of a directory containing the
|
||
theme to use. In that case, @var{theme-name} specifies the name of the
|
||
theme."
|
||
|
||
(define (slim.cfg)
|
||
(mlet %store-monad ((startx (or startx (xorg-start-command)))
|
||
(xinitrc (xinitrc #:fallback-session
|
||
auto-login-session))
|
||
(sessiondir (xsessions-directory sessions)))
|
||
(text-file* "slim.cfg" "
|
||
default_path /run/current-system/profile/bin
|
||
default_xserver " startx "
|
||
xserver_arguments :0 vt7
|
||
xauth_path " xauth "/bin/xauth
|
||
authfile /var/run/slim.auth
|
||
|
||
# The login command. '%session' is replaced by the chosen session name, one
|
||
# of the names specified in the 'sessions' setting: 'wmaker', 'xfce', etc.
|
||
login_cmd exec " xinitrc " %session
|
||
sessiondir " sessiondir "
|
||
|
||
halt_cmd " dmd "/sbin/halt
|
||
reboot_cmd " dmd "/sbin/reboot
|
||
"
|
||
(if auto-login?
|
||
(string-append "auto_login yes\ndefault_user " default-user "\n")
|
||
"")
|
||
(if theme-name
|
||
(string-append "current_theme " theme-name "\n")
|
||
""))))
|
||
|
||
(mlet %store-monad ((slim.cfg (slim.cfg)))
|
||
(return
|
||
(service
|
||
(documentation "Xorg display server")
|
||
(provision '(xorg-server))
|
||
(requirement '(user-processes host-name udev))
|
||
(start
|
||
#~(lambda ()
|
||
;; A stale lock file can prevent SLiM from starting, so remove it
|
||
;; to be on the safe side.
|
||
(false-if-exception (delete-file "/var/run/slim.lock"))
|
||
|
||
(fork+exec-command
|
||
(list (string-append #$slim "/bin/slim") "-nodaemon")
|
||
#:environment-variables
|
||
(list (string-append "SLIM_CFGFILE=" #$slim.cfg)
|
||
#$@(if theme
|
||
(list #~(string-append "SLIM_THEMESDIR=" #$theme))
|
||
#~())))))
|
||
(stop #~(make-kill-destructor))
|
||
(respawn? #t)
|
||
(pam-services
|
||
;; Tell PAM about 'slim'.
|
||
(list (unix-pam-service
|
||
"slim"
|
||
#:allow-empty-passwords? allow-empty-passwords?)))))))
|
||
|
||
;;; xorg.scm ends here
|