1 files changed, 10 insertions, 8 deletions

diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index 2d65f222947..afe5ae2d2ba 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -3,7 +3,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) (guix utils))
+(use-modules (gnu) (gnu system nss) (guix utils)
+             (guix packages))
 (use-service-modules desktop sddm xorg)
 (use-package-modules gnome)
 
@@ -73,7 +74,10 @@
   ;; by clicking the gear.  Use the "desktop" services, which
   ;; include the X11 log-in service, networking with
   ;; NetworkManager, and more.
-  (services (if (target-x86-64?)
+  (services (if (supported-package? gnome
+                                    (or (and=> (%current-target-system)
+                                               gnu-triplet->nix-system)
+                                        (%current-system)))
                 (append (list (service gnome-desktop-service-type)
                               (service xfce-desktop-service-type)
                               (set-xorg-configuration
@@ -81,16 +85,14 @@
                                 (keyboard-layout keyboard-layout))))
                         %desktop-services)
 
-                ;; FIXME: Since GDM depends on Rust (gdm -> gnome-shell -> gjs
-                ;; -> mozjs -> rust) and Rust is currently unavailable on
-                ;; non-x86_64 platforms, we use SDDM and Mate here instead of
-                ;; GNOME and GDM.
+                ;; FIXME: Since Gnome depends on Rust and Rust is currently
+                ;; unavailable on some platforms, we use MATE here instead of
+                ;; GNOME.
                 (append (list (service mate-desktop-service-type)
                               (service xfce-desktop-service-type)
                               (set-xorg-configuration
                                (xorg-configuration
-                                (keyboard-layout keyboard-layout))
-                               sddm-service-type))
+                                (keyboard-layout keyboard-layout))))
                         %desktop-services)))
 
   ;; Allow resolution of '.local' host names with mDNS.