diff options
| author | Timothy Sample <samplet@ngyro.com> | 2019-04-29 14:49:42 -0400 |
|---|---|---|
| committer | Timothy Sample <samplet@ngyro.com> | 2019-04-29 20:54:43 -0400 |
| commit | e8c6e771c199c02b748eb66d3a03c46d2a32ca29 (patch) | |
| tree | 6c0e87b8f93e83c1c78c9bd09c77b17b1f598747 | |
| parent | 649220adae24cf0eaffe4f4c5f76ada8b84b17bb (diff) | |
| download | guix-e8c6e771c199c02b748eb66d3a03c46d2a32ca29.tar.gz guix-e8c6e771c199c02b748eb66d3a03c46d2a32ca29.zip | |
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.
| -rw-r--r-- | gnu/packages/gnome.scm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 17dc2fd102..f19b1836d3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5597,7 +5597,7 @@ libxml2.") (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; We don't have <systemd/sd-daemon.h>. (substitute* '("common/gdm-log.c" "daemon/gdm-server.c" @@ -5665,6 +5665,16 @@ libxml2.") (("\"gnome-session\"") (string-append "\"" (assoc-ref inputs "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)) ;; GDM requires that there be at least one desktop entry ;; file. This phase installs a hidden one that simply |