diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2019-02-15 19:13:55 +0100 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2019-02-17 08:48:49 +0100 |
| commit | 24f11b06bbd2c7f4a236a5ef4b6d9c7bf5be47a8 (patch) | |
| tree | 92e64d4187048da35861d59c6c7c5d7faed4e545 /gnu | |
| parent | 3aeac37e61e44f63dd3fd29eb8f19b3b4993614c (diff) | |
| download | patches-24f11b06bbd2c7f4a236a5ef4b6d9c7bf5be47a8.tar patches-24f11b06bbd2c7f4a236a5ef4b6d9c7bf5be47a8.tar.gz | |
services: xorg: Enable override of xserver-arguments.
* gnu/services/xorg.scm (xorg-start-command): Add parameter #:xserver-arguments.
* doc/guix.texi (X Window): Document it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/xorg.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index f7d07b309e..f2a3c28c90 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com> +;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -292,7 +293,8 @@ in place of @code{/usr/bin/X}." (configuration-file (xorg-configuration-file #:modules modules #:fonts fonts)) - (xorg-server xorg-server)) + (xorg-server xorg-server) + (xserver-arguments '("-nolisten" "tcp"))) "Return a @code{startx} script in which @var{modules}, a list of X module 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 @@ -305,8 +307,8 @@ used in place of @code{startx}." (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)))) + "-logverbose" "-verbose" "-terminate" #$@xserver-arguments + (cdr (command-line)))) (program-file "startx" exp)) |