diff options
author | Mark H Weaver <mhw@netris.org> | 2015-08-18 23:56:14 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-08-18 23:56:14 -0400 |
commit | 6744aba846f23d7ee4e78a7f65e69c209fb933ec (patch) | |
tree | 0401b0ad61ca89ea56d41a09992a5b9958ffd0b1 | |
parent | 7f1b865819190935b3ee932b86bde80c30494073 (diff) | |
download | patches-6744aba846f23d7ee4e78a7f65e69c209fb933ec.tar patches-6744aba846f23d7ee4e78a7f65e69c209fb933ec.tar.gz |
Revert "PRELIMINARY: gnu: wpa-supplicant: Install dbus service files."
This reverts commit 9243fdf7790b748d2efbbc69d9c3c2b0101a98d4.
-rw-r--r-- | 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 8e90b1362c..319e78c05a 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 |