[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/08: PRELIMINARY: gnu: wpa-supplicant: Install dbus service files.
From: |
Mark H. Weaver |
Subject: |
07/08: PRELIMINARY: gnu: wpa-supplicant: Install dbus service files. |
Date: |
Wed, 19 Aug 2015 03:57:15 +0000 |
mhw pushed a commit to branch wip-network-manager
in repository guix.
commit e3243fe17e991e0c81cd4515fde3a4d879f7e26f
Author: Mark H Weaver <address@hidden>
Date: Mon Jul 27 02:39:28 2015 -0400
PRELIMINARY: gnu: wpa-supplicant: Install dbus service files.
---
gnu/packages/admin.scm | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 319e78c..8e90b13 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
- branch wip-network-manager created (now fbb0365), Mark H. Weaver, 2015/08/18
- 02/08: PRELIMINARY: dbus-service: Include system-services directories., Mark H. Weaver, 2015/08/18
- 01/08: PRELIMINARY: gnu: Add ppp., Mark H. Weaver, 2015/08/18
- 04/08: PRELIMINARY: Add dbus-fixed., Mark H. Weaver, 2015/08/18
- 05/08: PRELIMINARY: Add three programs to %setuid-programs., Mark H. Weaver, 2015/08/18
- 03/08: PRELIMINARY: gnu: polkit: Work on making it functional in practice., Mark H. Weaver, 2015/08/18
- 06/08: PRELIMINARY: Modify dbus-configuration to find setuid helper., Mark H. Weaver, 2015/08/18
- 07/08: PRELIMINARY: gnu: wpa-supplicant: Install dbus service files.,
Mark H. Weaver <=
- 08/08: PRELIMINARY: gnu: Add network-manager., Mark H. Weaver, 2015/08/18