amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging'

Browse source
This commit is contained in:
Marius Bakke 2022-10-16 00:10:07 +02:00
commit c567a82a69
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
85 changed files with 4256 additions and 9145 deletions
Download patch file Download diff file Expand all files Collapse all files

82
gnu/packages/linux.scm
View file

@ -5386,7 +5386,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
(define-public bluez
(package
(name "bluez")
(version "5.61")
(version "5.64")
(source (origin
(method url-fetch)
(uri (string-append
@ -5394,53 +5394,49 @@ Bluetooth audio output devices like headphones or loudspeakers.")
version ".tar.xz"))
(sha256
(base32
"0fs2kjsdhylxniqhii63i85fjszbqbz3iddwmgz4nmbr472xdbw3"))))
"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
`(("pkg-config" ,pkg-config)
("rst2man" ,python-docutils)
("gettext" ,gettext-minimal)))
(list pkg-config python-docutils gettext-minimal))
(inputs
(list glib dbus eudev libical readline))
(home-page "http://www.bluez.org/")