unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Timothy Sample <samplet@ngyro.com>
To: 34470@debbugs.gnu.org
Subject: [bug#34470] [PATCH 4/8] gnu: gdm: Use absolute path for gnome-session.
Date: Wed, 13 Feb 2019 14:22:17 -0500	[thread overview]
Message-ID: <20190213192221.26599-4-samplet@ngyro.com> (raw)
In-Reply-To: <87o97fijyh.fsf@ngyro.com>

* gnu/packages/gnome.scm (gdm)[arguments]: Modify the pre-configure
phase to substitute in the absolute path of gnome-session.
[inputs]: Add gnome-session.
---
 gnu/packages/gnome.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ac49ca7f2d..fdc5b68ef6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5349,7 +5349,7 @@ libxml2.")
        (modify-phases %standard-phases
          (add-before
           'configure 'pre-configure
-          (lambda _
+          (lambda* (#:key inputs #:allow-other-keys)
             ;; We don't have <systemd/sd-daemon.h>.
             (substitute* '("common/gdm-log.c"
                            "daemon/gdm-server.c"
@@ -5410,6 +5410,11 @@ libxml2.")
             (substitute* '("daemon/gdm-x-session.c")
               (("X_SERVER")
                "g_getenv (\"GDM_X_SERVER\")"))
+            ;; Use an absolute path for GNOME Session.
+            (substitute* "daemon/gdm-launch-environment.c"
+              (("\"gnome-session\"")
+               (string-append "\"" (assoc-ref inputs "gnome-session")
+                              "/bin/gnome-session\"")))
             #t))
          ;; GDM needs GNOME Session to run these applications.  We link
          ;; their autostart files in `share/gdm/greeter/autostart'
@@ -5441,6 +5446,7 @@ libxml2.")
      `(("accountsservice" ,accountsservice)
        ("check" ,check) ; for testing
        ("elogind" ,elogind)
+       ("gnome-session" ,gnome-session)
        ("gnome-settings-daemon" ,gnome-settings-daemon)
        ("gtk+" ,gtk+)
        ("iso-codes" ,iso-codes)
-- 
2.20.1

  parent reply	other threads:[~2019-02-13 19:30 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-13 19:09 [bug#34470] [PATCH 0/8] GDM without GNOME Desktop Timothy Sample
2019-02-13 19:22 ` [bug#34470] [PATCH 1/8] services: gdm: Remove etc service Timothy Sample
2019-02-13 19:22 ` [bug#34470] [PATCH 2/8] gnu: gnome-session: Use absolute paths in .desktop files Timothy Sample
2019-02-13 19:22 ` [bug#34470] [PATCH 3/8] gnu: gdm: Add links to required login-session files Timothy Sample
2019-02-13 19:22 ` Timothy Sample [this message]
2019-02-16 16:14   ` [bug#34470] [PATCH 4/8] gnu: gdm: Use absolute path for gnome-session Ludovic Courtès
2019-02-17 15:13     ` Timothy Sample
2019-03-04 10:38       ` Ludovic Courtès
2019-03-04 16:47         ` Timothy Sample
2019-03-04 21:08           ` bug#34470: " Ludovic Courtès
2019-02-13 19:22 ` [bug#34470] [PATCH 5/8] gnu: gdm: Simplify pre-configure phase Timothy Sample
2019-02-13 19:22 ` [bug#34470] [PATCH 6/8] gnu: gdm: Run dbus-daemon via a wrapper script Timothy Sample
2019-02-13 19:22 ` [bug#34470] [PATCH 7/8] services: gdm: Make dependencies explicit Timothy Sample
2019-02-13 19:22 ` [bug#34470] [PATCH 8/8] services: gdm: Allow for custom X session scripts Timothy Sample
2019-02-16 23:09 ` [bug#34470] [PATCH 0/8] GDM without GNOME Desktop Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190213192221.26599-4-samplet@ngyro.com \
    --to=samplet@ngyro.com \
    --cc=34470@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).