[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/21: gnu: bluez: Use new style.
From: |
guix-commits |
Subject: |
15/21: gnu: bluez: Use new style. |
Date: |
Thu, 23 Jun 2022 13:56:43 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 60f17c197d97fa12ab4924c3c8dd14d51252d015
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Jun 23 19:19:14 2022 +0200
gnu: bluez: Use new style.
* gnu/packages/linux.scm (bluez)[arguments]: Use G-expressions and remove
trailing #t's.
---
gnu/packages/linux.scm | 74 ++++++++++++++++++++++++--------------------------
1 file changed, 36 insertions(+), 38 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1b4b5caf2a..8fd65f506b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5417,46 +5417,44 @@ Bluetooth audio output devices like headphones or
loudspeakers.")
"0d6yl7l5zrlx5w3y503k72m9xsydx6gi1c65icchq1xknrjpwhxf"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- (let ((out (assoc-ref %outputs "out")))
- (list "--sysconfdir=/etc"
- "--localstatedir=/var"
- "--enable-library"
- "--disable-systemd"
- ;; TODO: is this needed? Not installed by default since 5.55.
- "--enable-hid2hci"
- ;; Install dbus/udev files to the correct location.
- (string-append "--with-dbusconfdir=" out "/etc")
- (string-append "--with-udevdir=" out "/lib/udev")))
- #:phases
- (modify-phases %standard-phases
- ;; Test unit/test-gatt fails unpredictably. Seems to be a timing
- ;; issue (discussion on upstream mailing list:
- ;; https://marc.info/?t=149578476300002&r=1&w=2)
- (add-before 'check 'skip-wonky-test
+ (list
+ #:configure-flags
+ #~(list "--sysconfdir=/etc"
+ "--localstatedir=/var"
+ "--enable-library"
+ "--disable-systemd"
+ ;; TODO: is this needed? Not installed by default since 5.55.
+ "--enable-hid2hci"
+ ;; Install dbus/udev files to the correct location.
+ (string-append "--with-dbusconfdir=" #$output "/etc")
+ (string-append "--with-udevdir=" #$output "/lib/udev"))
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Test unit/test-gatt fails unpredictably. Seems to be a timing
+ ;; issue (discussion on upstream mailing list:
+ ;; https://marc.info/?t=149578476300002&r=1&w=2)
+ (add-before 'check 'skip-wonky-test
(lambda _
(substitute* "unit/test-gatt.c"
- (("tester_init\\(&argc, &argv\\);") "return 77;"))
- #t))
- (add-after 'install 'post-install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (servicedir (string-append out "/share/dbus-1/services"))
- (service "obexd/src/org.bluez.obex.service")
- (rule (string-append
- out "/lib/udev/rules.d/97-hid2hci.rules")))
- ;; Install the obex dbus service file.
- (substitute* service
- (("/bin/false")
- (string-append out "/libexec/bluetooth/obexd")))
- (install-file service servicedir)
- ;; Fix paths in the udev rule.
- (substitute* rule
- (("hid2hci --method")
- (string-append out "/lib/udev/hid2hci --method"))
- (("/sbin/udevadm")
- (search-input-file inputs "/bin/udevadm")))
- #t))))))
+ (("tester_init\\(&argc, &argv\\);") "return 77;"))))
+ (add-after 'install 'post-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out #$output)
+ (servicedir (string-append out "/share/dbus-1/services"))
+ (service "obexd/src/org.bluez.obex.service")
+ (rule (string-append
+ out "/lib/udev/rules.d/97-hid2hci.rules")))
+ ;; Install the obex dbus service file.
+ (substitute* service
+ (("/bin/false")
+ (string-append out "/libexec/bluetooth/obexd")))
+ (install-file service servicedir)
+ ;; Fix paths in the udev rule.
+ (substitute* rule
+ (("hid2hci --method")
+ (string-append out "/lib/udev/hid2hci --method"))
+ (("/sbin/udevadm")
+ (search-input-file inputs "/bin/udevadm")))))))))
(native-inputs
(list pkg-config python-docutils gettext-minimal))
(inputs
- 10/21: gnu: libepoxy: Use new style., (continued)
- 10/21: gnu: libepoxy: Use new style., guix-commits, 2022/06/23
- 08/21: gnu: python-charset-normalizer: Update to 2.1.0., guix-commits, 2022/06/23
- 20/21: gnu: Remove postgresql@13 replacement., guix-commits, 2022/06/23
- 16/21: gnu: freeglut: Update to 3.2.2., guix-commits, 2022/06/23
- 12/21: gnu: libwebp: Simplify inputs., guix-commits, 2022/06/23
- 18/21: gnu: glu: Update to 9.0.2., guix-commits, 2022/06/23
- 07/21: gnu: python-urllib3: Update to 1.26.9., guix-commits, 2022/06/23
- 13/21: gnu: bluez: Update to 5.64., guix-commits, 2022/06/23
- 21/21: gnu: qtbase: Build with PostgreSQL@14., guix-commits, 2022/06/23
- 19/21: gnu: libinput: Update to 1.19.4., guix-commits, 2022/06/23
- 15/21: gnu: bluez: Use new style.,
guix-commits <=
- 05/21: gnu: python-certifi: Update to 2022.6.15., guix-commits, 2022/06/23
- 17/21: gnu: libical: Update to 3.0.14., guix-commits, 2022/06/23