34/34: gnu: mate-session-manager: Actually build with elogind support.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit a1a9d3848c4197f0e711e1d675771c82aa4dc200
Author: Ludovic Courtès <address@hidden>
AuthorDate: Thu Apr 2 16:05:05 2020 +0200

    gnu: mate-session-manager: Actually build with elogind support.
    
    Fixes <https://bugs.gnu.org/40327>.
    Reported by Jonathan Brielmaier <address@hidden>.
    
    This ensures one gets a "Shut Down" entry in the "System" menu.
    
    * gnu/packages/mate.scm (mate-session-manager)[arguments]: Pass
    "--with-elogind" instead of "--enable-elogind".  Remove 'pre-configure'
    phase.
---
 gnu/packages/mate.scm | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 28f6b1e..eaafc5d 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -352,28 +352,10 @@ configurations (profiles).")
          "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:configure-flags (list "--enable-elogind"
+     `(#:configure-flags (list "--with-elogind"
                                "--disable-schemas-compile")
        #:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'pre-configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; Use elogind instead of systemd.
-             (substitute* "configure"
-               (("libsystemd-login")
-                "libelogind")
-               (("systemd") "elogind"))
-             (substitute* "mate-session/gsm-systemd.c"
-               (("#include <systemd/sd-login.h>")
-                "#include <elogind/sd-login.h>"))
-             ;; Remove uses of the systemd journal.
-             (substitute* "mate-session/main.c"
-               (("#ifdef HAVE_SYSTEMD") "#if 0"))
-             (substitute* "mate-session/gsm-manager.c"
-               (("#ifdef HAVE_SYSTEMD") "#if 0"))
-             (substitute* "mate-session/gsm-autostart-app.c"
-               (("#ifdef HAVE_SYSTEMD") "#if 0"))
-             #t))
          (add-after 'install 'update-xsession-dot-desktop
            (lambda* (#:key outputs #:allow-other-keys)
              ;; Record the absolute file name of 'mate-session' in the