diff options
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/bluez/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/bluez/default.nix | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/bluez/default.nix b/nixpkgs/pkgs/os-specific/linux/bluez/default.nix index ab9b7055fdda..d09ef77fb0d8 100644 --- a/nixpkgs/pkgs/os-specific/linux/bluez/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/bluez/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , alsa-lib , dbus , ell @@ -11,7 +12,7 @@ , pkg-config , python3 , readline -, systemd +, systemdMinimal , udev , withExperimental ? false }: let @@ -22,11 +23,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.63"; + version = "5.64"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-k0nhHoFguz1yCDXScSUNinQk02kPUonm22/gfMZsbXY="; + sha256 = "sha256-rkN+ZbazBwwZi8WwEJ/pzeueqjhzgOIHL53mX+ih3jQ="; }; buildInputs = [ @@ -47,11 +48,22 @@ in stdenv.mkDerivation rec { python3.pkgs.wrapPython ]; - outputs = [ "out" "dev" ] ++ lib.optional doCheck "test"; + outputs = [ "out" "dev" "test" ]; + + patches = [ + # https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5 + # which fixes https://github.com/bluez/bluez/issues/329 + # and is already merged upstream and not yet in a release. + (fetchpatch { + name = "StateDirectory_and_ConfigurationDirectory.patch"; + url = "https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5.patch"; + sha256 = "sha256-MI6yPTiDLHsSTjLvNqtWnuy2xUMYpSat1WhMbeoedSM="; + }) + ]; postPatch = '' substituteInPlace tools/hid2hci.rules \ - --replace /sbin/udevadm ${systemd}/bin/udevadm \ + --replace /sbin/udevadm ${systemdMinimal}/bin/udevadm \ --replace "hid2hci " "$out/lib/udev/hid2hci " # Disable some tests: # - test-mesh-crypto depends on the following kernel settings: @@ -95,7 +107,7 @@ in stdenv.mkDerivation rec { doCheck = stdenv.hostPlatform.isx86_64; - postInstall = lib.optionalString doCheck '' + postInstall = '' mkdir -p $test/{bin,test} cp -a test $test pushd $test/test @@ -126,6 +138,7 @@ in stdenv.mkDerivation rec { filename=$(basename $files) install -Dm755 tools/$filename $out/bin/$filename done + install -Dm755 attrib/gatttool $out/bin/gatttool ''; enableParallelBuilding = true; |