From 86e3f95a09d903debba38cd1ff5dfd953f34a765 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Mon, 27 Jul 2015 04:03:28 -0400
Subject: [PATCH] PRELIMINARY: Add dbus-fixed.

---
 gnu/packages/glib.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 88c61b676b..9db54b7863 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -116,6 +116,24 @@ or through unencrypted TCP/IP suitable for use behind a firewall with
 shared NFS home directories.")
     (license license:gpl2+)))                     ; or Academic Free License 2.1
 
+;; XXX This fixed version is needed only for 'dbus-daemon-launch-helper'.
+;; FIXME: Integrate this change into the main 'dbus' package in the next
+;; core-updates cycle.
+(define dbus-fixed
+  (package
+    (inherit dbus)
+    (arguments
+     (substitute-keyword-arguments (package-arguments dbus)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after
+            'unpack 'add-standard-system-service-dir
+            (lambda _
+              (substitute* "dbus/dbus-sysdeps-util-unix.c"
+                (("standard_search_path\\[\\] =" all)
+                 (format #f "~a ~s" all "/run/current-system/profile/share:")))
+              #t))))))))
+
 (define glib
   (package
    (name "glib")