me
/
guix
Archived
1
0
Fork 0
Code

gnu: bluez: Use new style. 

* gnu/packages/linux.scm (bluez)[arguments]: Use G-expressions and remove
trailing #t's.
master
Marius Bakke 2022-06-23 19:19:14 +02:00
parent 6cb7e67dc5
commit 60f17c197d
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
gnu/packages/linux.scm
View File

@ -5417,46 +5417,44 @@ Bluetooth audio output devices like headphones or loudspeakers.")
"0d6yl7l5zrlx5w3y503k72m9xsydx6gi1c65icchq1xknrjpwhxf")))) "0d6yl7l5zrlx5w3y503k72m9xsydx6gi1c65icchq1xknrjpwhxf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list
(let ((out (assoc-ref %outputs "out"))) #:configure-flags
(list "--sysconfdir=/etc" #~(list "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--enable-library" "--enable-library"
"--disable-systemd" "--disable-systemd"
;; TODO: is this needed? Not installed by default since 5.55. ;; TODO: is this needed? Not installed by default since 5.55.
"--enable-hid2hci" "--enable-hid2hci"
;; Install dbus/udev files to the correct location. ;; Install dbus/udev files to the correct location.
(string-append "--with-dbusconfdir=" out "/etc") (string-append "--with-dbusconfdir=" #$output "/etc")
(string-append "--with-udevdir=" out "/lib/udev"))) (string-append "--with-udevdir=" #$output "/lib/udev"))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
;; Test unit/test-gatt fails unpredictably. Seems to be a timing ;; Test unit/test-gatt fails unpredictably. Seems to be a timing
;; issue (discussion on upstream mailing list: ;; issue (discussion on upstream mailing list:
;; https://marc.info/?t=149578476300002&r=1&w=2) ;; https://marc.info/?t=149578476300002&r=1&w=2)
(add-before 'check 'skip-wonky-test (add-before 'check 'skip-wonky-test
(lambda _ (lambda _
(substitute* "unit/test-gatt.c" (substitute* "unit/test-gatt.c"
(("tester_init\\(&argc, &argv\\);") "return 77;")) (("tester_init\\(&argc, &argv\\);") "return 77;"))))
#t)) (add-after 'install 'post-install
(add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys)
(lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out #$output)
(let* ((out (assoc-ref outputs "out")) (servicedir (string-append out "/share/dbus-1/services"))
(servicedir (string-append out "/share/dbus-1/services")) (service "obexd/src/org.bluez.obex.service")
(service "obexd/src/org.bluez.obex.service") (rule (string-append
(rule (string-append out "/lib/udev/rules.d/97-hid2hci.rules")))
out "/lib/udev/rules.d/97-hid2hci.rules"))) ;; Install the obex dbus service file.
;; Install the obex dbus service file. (substitute* service
(substitute* service (("/bin/false")
(("/bin/false") (string-append out "/libexec/bluetooth/obexd")))
(string-append out "/libexec/bluetooth/obexd"))) (install-file service servicedir)
(install-file service servicedir) ;; Fix paths in the udev rule.
;; Fix paths in the udev rule. (substitute* rule
(substitute* rule (("hid2hci --method")
(("hid2hci --method") (string-append out "/lib/udev/hid2hci --method"))
(string-append out "/lib/udev/hid2hci --method")) (("/sbin/udevadm")
(("/sbin/udevadm") (search-input-file inputs "/bin/udevadm")))))))))
(search-input-file inputs "/bin/udevadm")))
#t))))))
(native-inputs (native-inputs
(list pkg-config python-docutils gettext-minimal)) (list pkg-config python-docutils gettext-minimal))
(inputs (inputs