diff options
| author | Ian Eure <ian@retrospec.tv> | 2025-12-31 10:07:23 -0800 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2026-01-01 13:26:02 +0200 |
| commit | 7d4db1a37c39019c0840fe074f90df0b7be3c120 (patch) | |
| tree | f933e200ce5fb5c00d396856af937007ab03fd71 /gnu | |
| parent | fc650babdd064e57ccf6b6ea13b24e4162bab893 (diff) | |
gnu: services: Fix xorg configuration merging.
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>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/xorg.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 313023f38a0..068ad68df5d 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -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. |