diff options
| author | Feng Shu <tumashu@163.com> | 2024-04-23 14:37:13 +0800 |
|---|---|---|
| committer | Guix Patches Tester <> | 2024-04-23 10:04:48 +0200 |
| commit | cd14ca7eeb18060c5de436190deae950032edf78 (patch) | |
| tree | 16adf481d6c784c875fc2c5b9cc49650b577653e | |
| parent | af4db17122d759705f3fd0ab03ef36c76ec90338 (diff) | |
| download | guix-patches-issue-70527.tar guix-patches-issue-70527.tar.gz | |
services: sddm: Disable wayland display-serviceissue-70527
* gnu/services/sddm.scm (<sddm-configuration>): wayland is not walid value of
display-server.
(sddm-configuration-file): do not use sddm-configuration-display-server at the
moment, for user config: (display-server "wayland"), will let user's addm show
blank screen when sddm update to 0.20.
* doc/guix.texi (X Window): update display-server doc of sddm-service-type.
Change-Id: I75354eb75f54263389e5839e152fb85d4351aece
| -rw-r--r-- | doc/guix.texi | 4 | ||||
| -rw-r--r-- | gnu/services/sddm.scm | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 65af136e61..87c94111c4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23160,8 +23160,8 @@ The available fields are: The SDDM package to use. @item @code{display-server} (default: "x11") -Select display server to use for the greeter. Valid values are -@samp{"x11"} or @samp{"wayland"}. +Select display server to use for the greeter. Valid value is +@samp{"x11"}, currently do not support @samp{"x11-user"} and @samp{"wayland"}. @item @code{numlock} (default: "on") Valid values are @samp{"on"}, @samp{"off"} or @samp{"none"}. diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 48695e2806..a0859ccca5 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -45,8 +45,7 @@ (default sddm)) ;; [General] - ;; valid values are x11 and wayland - ;; currently doesn't do anything is enabled by wayland greeter PR + ;; valid values is x11, currently do not support x11-user and wayland. (display-server sddm-configuration-display-server (default "x11")) ;; valid values are on, off or none @@ -117,7 +116,14 @@ (define (sddm-configuration-file config) (mixed-text-file "sddm.conf" " [General] -DisplayServer=" (sddm-configuration-display-server config) " +DisplayServer=" (or "x11" + ;; sddm-0.20 begin support x11-user and wayland + ;; value, but sddm-service-type do not support them + ;; at the moment, setting to x11-user and wayland + ;; will let sddm show blank screen, update here + ;; when sddm-service-type really support x11-user + ;; and wayland. + (sddm-configuration-display-server config)) " Numlock=" (sddm-configuration-numlock config) " HaltCommand=" (sddm-configuration-halt-command config) " RebootCommand=" (sddm-configuration-reboot-command config) " |