summary refs log tree commit diff
path: root/gnu/installer/newt
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-04-07 17:15:06 +0200
committerLudovic Courtès <ludo@gnu.org>2019-04-07 17:18:04 +0200
commit75988317b22efee2b2719e7d559fa9ff01a9db9a (patch)
tree942a784ba68be4c0a7f16582016514cff2c292d5 /gnu/installer/newt
parente8aa4e9511e500ae23439b653e0b5e0f78c31159 (diff)
downloadguix-75988317b22efee2b2719e7d559fa9ff01a9db9a.tar.gz
installer: Generalize desktop environments to system services.
* gnu/installer/services.scm (<desktop-environment>): Rename to...
(<system-service>): ... this.  Add a 'type' field.
(%desktop-environments): Rename to...
(%system-services): ... this.
(desktop-system-service?): New procedure.
(desktop-environments->configuration): Rename to...
(system-services->configuration): ... this.  Determine the base list of
services based on whether SERVICES contains at least one "desktop"
service.
* gnu/installer/newt/services.scm (run-desktop-environments-cbt-page):
Adjust accordingly.
* gnu/installer.scm (installer-steps): Likewise.
Diffstat (limited to 'gnu/installer/newt')
-rw-r--r--gnu/installer/newt/services.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm
index adeb1d784a..2cbfc5ca36 100644
--- a/gnu/installer/newt/services.scm
+++ b/gnu/installer/newt/services.scm
@@ -32,11 +32,11 @@
 environments."
   (run-checkbox-tree-page
    #:info-text (G_ "Please select the desktop(s) environment(s) you wish to \
-install. If you select multiple desktops environments, we will be able to \
+install. If you select multiple desktops environments, you will be able to \
 choose the one to use on the log-in screen.")
    #:title (G_ "Desktop environment")
-   #:items %desktop-environments
-   #:item->text desktop-environment-name
+   #:items (filter desktop-system-service? %system-services)
+   #:item->text system-service-name
    #:checkbox-tree-height 5
    #:exit-button-callback-procedure
    (lambda ()