nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "PRELIMINARY: gnu: wpa-supplicant: Install dbus service files." 

This reverts commit 9243fdf779.
This commit is contained in:
Mark H Weaver 2015-08-18 23:56:14 -04:00
parent 7f1b865819
commit 6744aba846
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnu/packages/admin.scm
View File

@ -790,34 +790,25 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments wpa-supplicant-light) (substitute-keyword-arguments (package-arguments wpa-supplicant-light)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(alist-cons-after
(add-after 'configure 'configure-for-dbus
'configure 'configure-for-dbus (lambda _
(lambda _ (let ((port (open-file ".config" "al")))
(let ((port (open-file ".config" "al"))) (display "
(display "
CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS=y
CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_NEW=y
CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port) CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port)
(close-port port)) (close-port port))
#t)) #t)
(add-after (alist-cons-after
'install-man-pages 'install-dbus-conf 'install-man-pages 'install-dbus-conf
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(conf-dir (string-append out "/etc/dbus-1/system.d")) (dir (string-append out "/etc/dbus-1/system.d")))
(service-dir (mkdir-p dir)
(string-append out "/share/dbus-1/system-services"))) (copy-file "dbus/dbus-wpa_supplicant.conf"
(mkdir-p conf-dir) (string-append dir "/wpa_supplicant.conf"))))
(copy-file "dbus/dbus-wpa_supplicant.conf" ,phases)))))))
(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 (define-public wakelan
(package (package