summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-08-21 22:34:00 +0200
committerLudovic Courtès <ludo@gnu.org>2023-08-21 23:06:49 +0200
commitcf28f46930f1ea4087d84c162cfacfcdff842b1f (patch)
tree8c3e9019c30aa7331512740449c3694823ea335f /gnu
parentb08178a053757c4eb95b95e7c3c0d75881d8b714 (diff)
examples: Avoid 'modify-services' to remove GDM.
This led to a 'tests/guix-system.sh' failure on aarch64-linux: …/plasma.tmpl:60:13: error: modify-services: service 'gdm' not found in service list This is because 'gdm-service-type' is not among %DESKTOP-SERVICES on that architecture. * gnu/system/examples/plasma.tmpl (services): Use 'remove' rather 'modify-services' + 'delete'.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system/examples/plasma.tmpl10
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/system/examples/plasma.tmpl b/gnu/system/examples/plasma.tmpl
index 3df819a54f7..b29b6a05351 100644
--- a/gnu/system/examples/plasma.tmpl
+++ b/gnu/system/examples/plasma.tmpl
@@ -1,7 +1,7 @@
1;; This is an operating system configuration template 1;; This is an operating system configuration template
2;; for a "desktop" setup with Plasma. 2;; for a "desktop" setup with Plasma.
3 3
4(use-modules (gnu) (gnu system nss)) 4(use-modules (gnu) (gnu system nss) (srfi srfi-1))
5(use-service-modules desktop sddm xorg ssh) 5(use-service-modules desktop sddm xorg ssh)
6(use-package-modules certs gnome ssh admin fonts) 6(use-package-modules certs gnome ssh admin fonts)
7(use-package-modules qt xorg tmux linux) 7(use-package-modules qt xorg tmux linux)
@@ -57,8 +57,12 @@
57 (service sddm-service-type 57 (service sddm-service-type
58 (sddm-configuration 58 (sddm-configuration
59 (theme "breeze"))) 59 (theme "breeze")))
60 (modify-services %desktop-services 60
61 (delete gdm-service-type)))) 61 ;; Remove GDM if it's among %DESKTOP-SERVICES (on some
62 ;; architectures it's not there).
63 (remove (lambda (service)
64 (eq? (service-kind service) gdm-service-type))
65 %desktop-services)))
62 ;; Allow resolution of '.local' host names with mDNS. 66 ;; Allow resolution of '.local' host names with mDNS.
63 (name-service-switch %mdns-host-lookup-nss)) 67 (name-service-switch %mdns-host-lookup-nss))
64 68