[PATCH] gnu: wpa-supplicant: Install DBUS access configuration.

[PATCH] gnu: wpa-supplicant: Install DBUS access configuration.

[Tomáš Čech]

* gnu/packages/admin.scm (wpa-supplicant): Install DBUS configuration file.
---
 gnu/packages/admin.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 95b0c9f..354a01a 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -783,7 +783,15 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
       CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port)
               (close-port port))
             #t)
-          ,phases))))))
+          (alist-cons-after
+           'install-man-pages 'install-dbus-conf
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out       (assoc-ref outputs "out"))
+                   (dbus-path (string-append out "/etc/dbus-1/system.d")))
+               (mkdir-p dbus-path)
+               (copy-file "dbus/dbus-wpa_supplicant.conf"
+                          (string-append dbus-path "/wpa_supplicant.conf"))))
+           ,phases)))))))
 
 (define-public wakelan
   (package
-- 
2.2.1

Re: [PATCH] gnu: wpa-supplicant: Install DBUS access configuration.

[Tomáš Čech]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

On Thu, Mar 26, 2015 at 04:12:32PM +0100, Tomáš Čech wrote:
>* gnu/packages/admin.scm (wpa-supplicant): Install DBUS configuration file.
>---
> gnu/packages/admin.scm | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
>index 95b0c9f..354a01a 100644
>--- a/gnu/packages/admin.scm
>+++ b/gnu/packages/admin.scm
>@@ -783,7 +783,15 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
>       CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port)
>               (close-port port))
>             #t)
>-          ,phases))))))
>+          (alist-cons-after
>+           'install-man-pages 'install-dbus-conf
>+           (lambda* (#:key outputs #:allow-other-keys)
>+             (let* ((out       (assoc-ref outputs "out"))
>+                   (dbus-path (string-append out "/etc/dbus-1/system.d")))

Here is the indentation incorrect (missing one space).

>+               (mkdir-p dbus-path)
>+               (copy-file "dbus/dbus-wpa_supplicant.conf"
>+                          (string-append dbus-path "/wpa_supplicant.conf"))))
>+           ,phases)))))))
>
> (define-public wakelan
>   (package
>-- 
>2.2.1
>
>

[-- Attachment #2: Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH] gnu: wpa-supplicant: Install DBUS access configuration.

[Ludovic Courtès]

Tomáš Čech <sleep_walker@gnu.org> skribis:

> * gnu/packages/admin.scm (wpa-supplicant): Install DBUS configuration file.

s/DBUS/D-Bus/ (in the subject line as well)

> +          (alist-cons-after
> +           'install-man-pages 'install-dbus-conf
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out       (assoc-ref outputs "out"))
> +                   (dbus-path (string-append out "/etc/dbus-1/system.d")))

Add a space for proper alignment.

s/dbus-path/dir/ for instance (with GNU conventions, “path” refers to a
search path, not to a file/directory name.)

OK to push with these changes.

Thanks,
Ludo’.