nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gdm: Avoid selecting the placeholder session. 

This fixes <https://bugs.gnu.org/35484>.

* gnu/packages/gnome.scm (gdm)[arguments]: Modify the pre-configure phase to
patch GDM to only select the placeholder session if there are no others.
This commit is contained in:
Timothy Sample 2019-04-29 14:49:42 -04:00
parent 649220adae
commit e8c6e771c1
No known key found for this signature in database
GPG Key ID: 2AC6A5EC1C357C59
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/gnome.scm
View File

@ -5597,7 +5597,7 @@ libxml2.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before (add-before
'configure 'pre-configure 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; We don't have <systemd/sd-daemon.h>. ;; We don't have <systemd/sd-daemon.h>.
(substitute* '("common/gdm-log.c" (substitute* '("common/gdm-log.c"
"daemon/gdm-server.c" "daemon/gdm-server.c"
@ -5665,6 +5665,16 @@ libxml2.")
(("\"gnome-session\"") (("\"gnome-session\"")
(string-append "\"" (assoc-ref inputs "gnome-session") (string-append "\"" (assoc-ref inputs "gnome-session")
"/bin/gnome-session\""))) "/bin/gnome-session\"")))
;; Do not automatically select the placeholder session.
(substitute* "daemon/gdm-session.c"
(("!g_str_has_suffix [(]base_name, \"\\.desktop\"[)]")
(string-append "!g_str_has_suffix (base_name, \".desktop\") || "
"(g_strcmp0(search_dirs[i], \""
(assoc-ref outputs "out") "/share/gdm/BuiltInSessions/"
"\") == 0 && "
"g_strcmp0(base_name, \"fail.desktop\") == 0)"))
(("g_error [(]\"GdmSession: no session desktop files installed, aborting\\.\\.\\.\"[)];")
"{ self->priv->fallback_session_name = g_strdup(\"fail\"); goto out; }"))
#t)) #t))
;; GDM requires that there be at least one desktop entry ;; GDM requires that there be at least one desktop entry
;; file. This phase installs a hidden one that simply ;; file. This phase installs a hidden one that simply