ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 13:28:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xorg: honor xorg-configuration-server in xorg-configuration->file

Browse source 
Fixes <https://bugs.gnu.org/40806>.

Previously the xorg-server package specified in the configuration was ignored
entirely in xorg-configuration->file.  This had the effect that while the X
program of the configured package would be executed, the modules of the
configured package would be ignored in favor of the default xorg-server
package's modules.  This fixes that.

* gnu/services/xorg.scm (xorg-configuration->file): honor
  xorg-configuration-server.
This commit is contained in:
Caleb Ristvedt 2020-06-02 06:28:46 -05:00
parent 0266094531
commit 8b158e8b2c
No known key found for this signature in database
GPG key ID: C166AA495F7F189C
1 changed files with 74 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/services/xorg.scm
View file

@ -180,6 +180,7 @@ (define-record-type* <xorg-configuration>
(define (xorg-configuration->file config)
"Compute an Xorg configuration file corresponding to CONFIG, an
<xorg-configuration> record."
(let ((xorg-server (xorg-configuration-server config)))
(define all-modules
;; 'xorg-server' provides 'fbdevhw.so' etc.
(append (xorg-configuration-modules config)
@ -305,7 +306,7 @@ (define (expand modules)
(display config port))
'#$(xorg-configuration-extra-config config))))))
(computed-file "xserver.conf" build))
(computed-file "xserver.conf" build)))
(define (xorg-configuration-directory modules)
"Return a directory that contains the @code{.conf} files for X.org that