From 58c9cbc63bd4ba6ff33442e7c2a461920b6349d0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 22 Aug 2022 17:10:04 -0400 Subject: [PATCH] gnu: bluez: Update to 5.65, use gexps and remove input labels. * gnu/packages/linux.scm (bluez): Update to 5.65. [arguments]: Use gexps. [phases]: Delete trailing #t. [native-inputs]: Delete labels. --- gnu/packages/linux.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index aa777095c4..6aa5891057 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2019 Tim Gesthuizen -;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau @@ -5302,7 +5302,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.64") + (version "5.65") (source (origin (method url-fetch) (uri (string-append @@ -5310,7 +5310,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "0d6yl7l5zrlx5w3y503k72m9xsydx6gi1c65icchq1xknrjpwhxf")))) + "1m4n7nczjlbhb20bp2hwb2b85036xma5pqljmpk7ddalhgaa8r95")))) (build-system gnu-build-system) (arguments (list @@ -5335,24 +5335,26 @@ Bluetooth audio output devices like headphones or loudspeakers.") (("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")) + (let* ((servicedir (string-append #$output + "/share/dbus-1/services")) (service "obexd/src/org.bluez.obex.service") (rule (string-append - out "/lib/udev/rules.d/97-hid2hci.rules"))) + #$output "/lib/udev/rules.d/97-hid2hci.rules"))) ;; Install the obex dbus service file. (substitute* service (("/bin/false") - (string-append out "/libexec/bluetooth/obexd"))) + (string-append #$output "/libexec/bluetooth/obexd"))) (install-file service servicedir) ;; Fix paths in the udev rule. (substitute* rule (("hid2hci --method") - (string-append out "/lib/udev/hid2hci --method")) + (string-append #$output "/lib/udev/hid2hci --method")) (("/sbin/udevadm") (search-input-file inputs "/bin/udevadm"))))))))) (native-inputs - (list pkg-config python-docutils gettext-minimal)) + (list gettext-minimal + pkg-config + python-docutils)) (inputs (list glib dbus eudev libical readline)) (home-page "http://www.bluez.org/")