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>

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.