diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-06-19 14:22:02 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-06-19 14:22:53 -0400 |
| commit | 84530eef766d3dbe73d07593531d07c35a1be9ed (patch) | |
| tree | 7b64129c6e6eeeddf367e5dd290323137b4e6796 /gnu/packages/linux.scm | |
| parent | c0eeccbc2486572de1ef88249c63bc71c28dfef6 (diff) | |
| parent | 3ebba94d45e4cc9c5242f812b29c826904506b02 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3aa3adea72..a9d1676075 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2424,7 +2424,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.39") + (version "5.40") (source (origin (method url-fetch) (uri (string-append @@ -2432,16 +2432,39 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "0fsrf9rdmrdyx0vmcpfji4imjsvliawyy5sjb6b64myka28vrl91")))) + "09ywk3lvgis0nbi0d5z8d4qp5r33lzwnd6bdakacmbsm420qpnns")))) (build-system gnu-build-system) (arguments '(#:configure-flags (let ((out (assoc-ref %outputs "out"))) - (list "--enable-library" + (list "--sysconfdir=/etc" + "--localstatedir=/var" + "--enable-library" "--disable-systemd" ;; Install dbus/udev files to the correct location. (string-append "--with-dbusconfdir=" out "/etc") - (string-append "--with-udevdir=" out "/lib/udev"))))) + (string-append "--with-udevdir=" out "/lib/udev"))) + #:phases + (modify-phases %standard-phases + (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") + (string-append (assoc-ref inputs "eudev") "/bin/udevadm"))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gnu-gettext))) |