diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-08 19:10:31 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-08 19:10:31 -0500 |
commit | a83fa6410f8e2fd1a0ffdeb2d0304c6ad180fa03 (patch) | |
tree | 2d636fc26c5eaff81b39cf7c772b5cb1afd6f2ae /pkgs/os-specific/linux/bluez/default.nix | |
parent | 04577a28d6212c63b00751576610b47e13fdf522 (diff) | |
parent | 83655d69937f6d1b62e8cc791cea27026bd21249 (diff) | |
download | nixpkgs-a83fa6410f8e2fd1a0ffdeb2d0304c6ad180fa03.tar nixpkgs-a83fa6410f8e2fd1a0ffdeb2d0304c6ad180fa03.tar.gz nixpkgs-a83fa6410f8e2fd1a0ffdeb2d0304c6ad180fa03.tar.bz2 nixpkgs-a83fa6410f8e2fd1a0ffdeb2d0304c6ad180fa03.tar.lz nixpkgs-a83fa6410f8e2fd1a0ffdeb2d0304c6ad180fa03.tar.xz nixpkgs-a83fa6410f8e2fd1a0ffdeb2d0304c6ad180fa03.tar.zst nixpkgs-a83fa6410f8e2fd1a0ffdeb2d0304c6ad180fa03.zip |
Merge pull request #74995 from Moredread/bluez
bluez: 5.50 -> 5.52
Diffstat (limited to 'pkgs/os-specific/linux/bluez/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 76 |
1 files changed, 45 insertions, 31 deletions
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index cca3674bdd1..8024adeac64 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,49 +1,58 @@ -{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - python3, readline, udev, libical, systemd, fetchpatch, - enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }: +{ stdenv +, lib +, fetchurl +, alsaLib +, dbus +, glib +, json_c +, libical +, pkgconfig +, python3 +, readline +, systemd +, udev +}: stdenv.mkDerivation rec { - name = "bluez-5.50"; + pname = "bluez"; + version = "5.52"; src = fetchurl { - url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z"; + url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; + sha256 = "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p"; }; pythonPath = with python3.pkgs; [ - dbus-python pygobject2 pygobject3 recursivePthLoader + dbus-python + pygobject3 + recursivePthLoader ]; buildInputs = [ - dbus glib alsaLib python3 python3.pkgs.wrapPython - readline udev libical + alsaLib + dbus + glib + json_c + libical + python3 + readline + udev ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + python3.pkgs.wrapPython + ]; outputs = [ "out" "dev" "test" ]; - patches = [ - ./bluez-5.37-obexd_without_systemd-1.patch - (fetchpatch { - url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=1880b299086659844889cdaf687133aca5eaf102"; - name = "CVE-2018-10910-1.patch"; - sha256 = "17spsxza27gif8jpxk7360ynvwii1llfdfwg35rwywjjmvww0qj4"; - }) - (fetchpatch { - url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9213ff7642a33aa481e3c61989ad60f7985b9984"; - name = "CVE-2018-10910-2.patch"; - sha256 = "0j7klbhym64yhn86dbsmybqmwx47bviyyhx931izl1p29z2mg8hn"; - }) - ]; - - postConfigure = '' + postPatch = '' substituteInPlace tools/hid2hci.rules \ --replace /sbin/udevadm ${systemd}/bin/udevadm \ --replace "hid2hci " "$out/lib/udev/hid2hci " ''; - configureFlags = (with stdenv.lib; [ + configureFlags = [ "--localstatedir=/var" "--enable-library" "--enable-cups" @@ -54,14 +63,19 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" "--with-udevdir=${placeholder "out"}/lib/udev" - ] ++ optional enableWiimote [ "--enable-wiimote" ] - ++ optional enableMidi [ "--enable-midi" ] - ++ optional enableSixaxis [ "--enable-sixaxis" ]); + "--enable-health" + "--enable-mesh" + "--enable-midi" + "--enable-nfc" + "--enable-sap" + "--enable-sixaxis" + "--enable-wiimote" + ]; # Work around `make install' trying to create /var/lib/bluetooth. - installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; + installFlags = [ "statedir=$(TMPDIR)/var/lib/bluetooth" ]; - makeFlags = "rulesdir=${placeholder "out"}/lib/udev/rules.d"; + makeFlags = [ "rulesdir=${placeholder "out"}/lib/udev/rules.d" ]; postInstall = '' mkdir -p $test/{bin,test} |