(name . guix-patches)(address . guix-patches@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 <maxim.cournoyer@gmail.com>
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(+)
Toggle diff (21 lines)
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
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEJ9WGpPiQCFQyn/CfEmDkZILmNWIFAl146XEACgkQEmDkZILm
NWIjHA//UIbMs3PCLlI6VsyfJq+/jtb2cgqtP1Biv7SsjGlsawHN1J9H0MMSdGaq
xjW9PXqCLzTg+AFUWVhcZHweRbTg/yvYcVZi/d9q6uDcmgcBhY6d/Td9Pd0pb9RL
dqy9P8mCJkMmnNoTtOD4dET5tafOm+964dlUes7FxXewJBmLI88CxiZ57cpgYp2+
wuJjtvSS9wRu842iz/403nKPQxmW+S3Pt5tWTfDrbYFeoZl/wR7SZ+dEHitmvWYS
Q6NvcplKNzm2Q+q44kKupqw5mISB21TaIGDF42NkMiMvdMV7tLvJQmJKfg0QcTr4
lXc/eHHt8jj5/a5wEKlMuoOF+1DH/1ssT4BnrKcBQrI9as66VabaqZYuDIWSLk7e
OKCrnMPHov50sMtAo7ZSpgLqkqH5VKx+pJQh8oRQYQNI1w700VXVXDFhICh8kBE6
x399OzEHKeEBIAAeKe9JbfTHTIEfjEXlhf7N3S9+vAiJY84iyIlxWLIYiSEjRAgJ
HaP2Oxh1AThxWNOZmpG7EE0RUJvo44C2KI2o3JrxvIZVv6DEmdTDe+M78z/qSqlP
rJq3YyMkTOoXoElSy4GkokDme0SxTtnbAaRYoawqqGN4gvwGAtAS4OJ9/hRdvKmF
hUbIduVOvCspqXqcJPpJY9o6esE+yfTfAQ/rOmz3FEkZo2JPtQ4=
=VsQV
-----END PGP SIGNATURE-----