bug#52943: Cannot build guix as part of guix system reconfigure after commit 224d437fb4 on aarch64

[Akira Kyle <akira@akirakyle.com>]

[-- Attachment #1: Type: text/plain, Size: 121 bytes --]

The attached patch fixes the failing guix-system.sh test on aarch64.
However there are now other tests that are failing.

[-- Attachment #2: 0001-tests-guix-system-Fix-on-non-x86_64-systems.patch --]
[-- Type: application/octet-stream, Size: 2913 bytes --]

From e2a6d4c4043a1e149a5eb99343fc6049ba2778bb Mon Sep 17 00:00:00 2001
From: Akira Kyle <akira@akirakyle.com>
Date: Mon, 3 Jan 2022 14:23:46 -0700
Subject: [PATCH] tests: guix-system: Fix on non-x86_64 systems

Addresses issue 52943 caused by commit 49599fab56

* gnu/system/examples/desktop.tmpl: explicitly set optional
login-manager-service-type argument

* gnu/system/examples/vm-image.tmpl: also remove sddm-service-type from
%desktop-services
---
 gnu/system/examples/desktop.tmpl  | 12 +++++++++---
 gnu/system/examples/vm-image.tmpl |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index a209fbcb05..aec0466cb6 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -2,8 +2,8 @@
 ;; for a "desktop" setup with GNOME and Xfce where the
 ;; root partition is encrypted with LUKS, and a swap file.
 
-(use-modules (gnu) (gnu system nss))
-(use-service-modules desktop xorg)
+(use-modules (gnu) (gnu system nss) (guix utils))
+(use-service-modules desktop xorg sddm)
 (use-package-modules certs gnome)
 
 (operating-system
@@ -78,7 +78,13 @@
                           (service xfce-desktop-service-type)
                           (set-xorg-configuration
                            (xorg-configuration
-                            (keyboard-layout keyboard-layout))))
+                            (keyboard-layout keyboard-layout))
+                           ;; See comment in desktop-services-for-system
+                           (if (string-prefix? "x86_64"
+                                               (or (%current-target-system)
+                                                   (%current-system)))
+                               gdm-service-type
+                               sddm-service-type)))
                     %desktop-services))
 
   ;; Allow resolution of '.local' host names with mDNS.
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl
index a59d91587b..bd9b6b8402 100644
--- a/gnu/system/examples/vm-image.tmpl
+++ b/gnu/system/examples/vm-image.tmpl
@@ -5,7 +5,7 @@
 ;;
 
 (use-modules (gnu) (guix) (srfi srfi-1))
-(use-service-modules desktop mcron networking spice ssh xorg)
+(use-service-modules desktop mcron networking spice ssh xorg sddm)
 (use-package-modules bootloaders certs fonts nvi
                      package-management wget xorg)
 
@@ -113,6 +113,7 @@ root ALL=(ALL) ALL
                      (let ((type (service-kind service)))
                        (or (memq type
                                  (list gdm-service-type
+                                       sddm-service-type
                                        wpa-supplicant-service-type
                                        cups-pk-helper-service-type
                                        network-manager-service-type
-- 
2.34.0