Subject: bug#37379: closed (Re: [bug#37379] [PATCH] [core-updates] gnu: glib: Reference dbus-launch by its absolute path.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 21 Oct 2019 03:05:03 +0000

Your bug report

#37379: [PATCH] [core-updates] gnu: glib: Reference dbus-launch by its absolute path.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
37379: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37379
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#37379] [PATCH] [core-updates] gnu: glib: Reference dbus-launch by its absolute path.
From: Maxim Cournoyer <[email-masked]>
To: Danny Milosavljevic <[email-masked]>
Cc: [email-masked]
Date: Mon, 21 Oct 2019 12:04:47 +0900
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello,

Maxim Cournoyer <[email-masked]> writes:

> Hello Danny!
>
> Danny Milosavljevic <[email-masked]> writes:
>
>> LGTM!
>
> Thank you for the review.  I'll delay merging this into core-updates
> until it has been merged to master (which should be imminent).
>
> Maxim

Pushed to core-updates as 7da3e81aa1.

Closing,

Maxim

Subject: [PATCH] [core-updates] gnu: glib: Reference dbus-launch by its absolute path.
From: Maxim Cournoyer <[email-masked]>
To: guix-patches <[email-masked]>
Date: Wed, 11 Sep 2019 21:32:49 +0900
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello,

This allows programs or libraries compiled with glib to connect to dbus
without having the 'dbus-launch' binary present (propagated) into their
profile.

dbus triggers lots of rebuilds, so this should be merged to the
core-updates branch.

Thank you,

Maxim

From 1881ad1305f55f3bf7ac7a48ea1c76123f2864b2 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <[email-masked]>
Date: Tue, 10 Sep 2019 11:02:16 +0900
Subject: [PATCH] gnu: glib: Reference dbus-launch by its absolute path.

* gnu/packages/glib.scm (glib)[phases]{patch-dbus-launch-path}: New phase.
---
 gnu/packages/glib.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 3a50347f86..fb148eec19 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -199,6 +199,14 @@ shared NFS home directories.")
    (arguments
     `(#:phases
       (modify-phases %standard-phases
+        (add-after 'unpack 'patch-dbus-launch-path
+          (lambda* (#:key inputs #:allow-other-keys)
+            (let ((dbus (assoc-ref inputs "dbus")))
+              (substitute* "gio/gdbusaddress.c"
+                (("command_line = g_strdup_printf \\(\"dbus-launch")
+                 (string-append "command_line = g_strdup_printf (\""
+                                dbus "/bin/dbus-launch")))
+              #t)))
         (add-before 'build 'pre-build
           (lambda* (#:key inputs outputs #:allow-other-keys)
             ;; For tests/gdatetime.c.
-- 
2.23.0