From 9243fdf7790b748d2efbbc69d9c3c2b0101a98d4 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Mon, 27 Jul 2015 02:39:28 -0400
Subject: [PATCH] PRELIMINARY: gnu: wpa-supplicant: Install dbus service files.

---
 gnu/packages/admin.scm | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 319e78c05a..8e90b1362c 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -790,25 +790,34 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
     (arguments
      (substitute-keyword-arguments (package-arguments wpa-supplicant-light)
        ((#:phases phases)
-        `(alist-cons-after
-          'configure 'configure-for-dbus
-          (lambda _
-            (let ((port (open-file ".config" "al")))
-              (display "
+        `(modify-phases ,phases
+           (add-after
+            'configure 'configure-for-dbus
+            (lambda _
+              (let ((port (open-file ".config" "al")))
+                (display "
       CONFIG_CTRL_IFACE_DBUS=y
       CONFIG_CTRL_IFACE_DBUS_NEW=y
       CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port)
-              (close-port port))
-            #t)
-          (alist-cons-after
-           'install-man-pages 'install-dbus-conf
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (dir (string-append out "/etc/dbus-1/system.d")))
-               (mkdir-p dir)
-               (copy-file "dbus/dbus-wpa_supplicant.conf"
-                          (string-append dir "/wpa_supplicant.conf"))))
-           ,phases)))))))
+                (close-port port))
+              #t))
+           (add-after
+            'install-man-pages 'install-dbus-conf
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (conf-dir (string-append out "/etc/dbus-1/system.d"))
+                     (service-dir
+                      (string-append out "/share/dbus-1/system-services")))
+                (mkdir-p conf-dir)
+                (copy-file "dbus/dbus-wpa_supplicant.conf"
+                           (string-append conf-dir "/wpa_supplicant.conf"))
+                (mkdir-p service-dir)
+                (for-each (lambda (file)
+                            (copy-file
+                             file
+                             (string-append service-dir "/" (basename file))))
+                          (find-files "dbus" "\\.service$"))
+                #t)))))))))
 
 (define-public wakelan
   (package