[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/08: Revert "PRELIMINARY: gnu: wpa-supplicant: Install dbus service fi
From: |
Mark H. Weaver |
Subject: |
02/08: Revert "PRELIMINARY: gnu: wpa-supplicant: Install dbus service files." |
Date: |
Wed, 19 Aug 2015 03:56:28 +0000 |
mhw pushed a commit to branch master
in repository guix.
commit 6744aba846f23d7ee4e78a7f65e69c209fb933ec
Author: Mark H Weaver <address@hidden>
Date: Tue Aug 18 23:56:14 2015 -0400
Revert "PRELIMINARY: gnu: wpa-supplicant: Install dbus service files."
This reverts commit 9243fdf7790b748d2efbbc69d9c3c2b0101a98d4.
---
gnu/packages/admin.scm | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 8e90b13..319e78c 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -790,34 +790,25 @@ This package provides the 'wpa_supplicant' daemon and the
'wpa_cli' command.")
(arguments
(substitute-keyword-arguments (package-arguments wpa-supplicant-light)
((#:phases phases)
- `(modify-phases ,phases
- (add-after
- 'configure 'configure-for-dbus
- (lambda _
- (let ((port (open-file ".config" "al")))
- (display "
+ `(alist-cons-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))
- (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)))))))))
+ (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)))))))
(define-public wakelan
(package
- branch master updated (0f402e4 -> 2376963), Mark H. Weaver, 2015/08/18
- 02/08: Revert "PRELIMINARY: gnu: wpa-supplicant: Install dbus service files.",
Mark H. Weaver <=
- 03/08: Revert "PRELIMINARY: Modify dbus-configuration to find setuid helper.", Mark H. Weaver, 2015/08/18
- 05/08: Revert "PRELIMINARY: Add dbus-fixed.", Mark H. Weaver, 2015/08/18
- 07/08: Revert "PRELIMINARY: dbus-service: Include system-services directories.", Mark H. Weaver, 2015/08/18
- 04/08: Revert "PRELIMINARY: Add three programs to %setuid-programs.", Mark H. Weaver, 2015/08/18
- 06/08: Revert "PRELIMINARY: gnu: polkit: Work on making it functional in practice.", Mark H. Weaver, 2015/08/18
- 01/08: Revert "PRELIMINARY: gnu: Add network-manager.", Mark H. Weaver, 2015/08/18
- 08/08: Revert "PRELIMINARY: gnu: Add ppp.", Mark H. Weaver, 2015/08/18