tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: services: Fix xorg configuration merging.

Browse Source 
A bug in #21 causes the default configuration to be omitted from the xorg
merging process.  This can cause users not using set-xorg-configuration or
service extensions to end up with a broken configuration.

Fixes #5267.

* tests/services/xorg.scm: Add a regression test.
* gnu/services/xorg.scm (handle-xorg-configuration): Include the
xorg-configuration record from config in merges.

Change-Id: I6bed8c109057cb9b5de36db68b78e3ccc88e6bcb
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Ian Eure
2025-12-31 10:07:23 -08:00
committed by Efraim Flashner
parent fc650babdd
commit 7d4db1a37c
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/services/xorg.scm
View File

@@ -685,7 +685,11 @@ a `service-extension', as used by `set-xorg-configuration'."
(configuration-record
(inherit config)
(xorg-configuration
(merge-xorg-configurations xorg-configurations)))))))))
(merge-xorg-configurations
(cons ((record-accessor (record-type-descriptor config)
'xorg-configuration)
config)
xorg-configurations))))))))))
(define (xorg-server-profile-service config)
;; XXX: profile-service-type only accepts <package> objects.