From cf3cb16921e73ace309fa272fc2353f6860f84db Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 20 Oct 2024 10:06:14 -0500 Subject: [PATCH] bob: pin bluez to 5.76 --- hosts/bob/default.nix | 7 +- pkgs/bluez/default.nix | 180 +++++++++++++++++++++++++++++++++++++++++ pkgs/default.nix | 2 + 3 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 pkgs/bluez/default.nix diff --git a/hosts/bob/default.nix b/hosts/bob/default.nix index 90a1ae6e..d9ec587d 100644 --- a/hosts/bob/default.nix +++ b/hosts/bob/default.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ inputs, config, ... }: +{ inputs, config, pkgs, ... }: { imports = [ @@ -31,7 +31,10 @@ wifi.backend = "iwd"; }; services.geoclue2.enableWifi = false; - hardware.bluetooth.enable = true; + hardware.bluetooth = { + enable = true; + package = pkgs.bluez-5_76; + }; fileSystems."/mnt/sdcard" = { device = "/dev/mmcblk0p1"; diff --git a/pkgs/bluez/default.nix b/pkgs/bluez/default.nix new file mode 100644 index 00000000..9b27f857 --- /dev/null +++ b/pkgs/bluez/default.nix @@ -0,0 +1,180 @@ +{ lib +, stdenv +, alsa-lib +, dbus +, docutils +, ell +, enableExperimental ? false +, fetchpatch +, fetchurl +, glib +, json_c +, libical +, pkg-config +, python3Packages +, readline +, systemdMinimal +, udev + # Test gobject-introspection instead of pygobject because the latter + # causes an infinite recursion. +, gobject-introspection +, buildPackages +, installTests ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bluez"; + version = "5.76"; + + src = fetchurl { + url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz"; + hash = "sha256-VeLGRZCa2C2DPELOhewgQ04O8AcJQbHqtz+s3SQLvWM="; + }; + + patches = [ + # hog-lib: Fix passing wrong parameters to bt_uhid_get_report_reply + (fetchpatch { + url = "https://github.com/bluez/bluez/commit/5ebaeab4164f80539904b9a520d9b7a8307e06e2.patch"; + hash = "sha256-f1A8DmRPfm+zid4XMj1zsfcLZ0WTEax3YPbydKZF9RE="; + }) + ] + # Disable one failing test with musl libc, also seen by alpine + # https://github.com/bluez/bluez/issues/726 + ++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48"; + hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4="; + }) + ; + + buildInputs = [ + alsa-lib + dbus + ell + glib + json_c + libical + python3Packages.python + readline + udev + ]; + + nativeBuildInputs = [ + docutils + pkg-config + python3Packages.wrapPython + ]; + + outputs = [ "out" "dev" ] + ++ lib.optional installTests "test"; + + postPatch = '' + substituteInPlace tools/hid2hci.rules \ + --replace-fail /sbin/udevadm ${systemdMinimal}/bin/udevadm \ + --replace-fail "hid2hci " "$out/lib/udev/hid2hci " + '' + + # Disable some tests: + # - test-mesh-crypto depends on the following kernel settings: + # CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC] + '' + if [[ ! -f unit/test-mesh-crypto.c ]]; then + echo "unit/test-mesh-crypto.c no longer exists" + false + fi + echo 'int main() { return 77; }' > unit/test-mesh-crypto.c + ''; + + configureFlags = [ + "--localstatedir=/var" + (lib.enableFeature enableExperimental "experimental") + (lib.enableFeature true "btpclient") + (lib.enableFeature true "cups") + (lib.enableFeature true "external-ell") + (lib.enableFeature true "health") + (lib.enableFeature true "hid2hci") + (lib.enableFeature true "library") + (lib.enableFeature true "logger") + (lib.enableFeature true "mesh") + (lib.enableFeature true "midi") + (lib.enableFeature true "nfc") + (lib.enableFeature true "pie") + (lib.enableFeature true "sixaxis") + # Set "deprecated" to provide ciptool, sdptool, and rfcomm (unmaintained); + # superseded by new D-Bus APIs + (lib.enableFeature true "deprecated") + (lib.withFeatureAs true "dbusconfdir" "${placeholder "out"}/share") + (lib.withFeatureAs true "dbussessionbusdir" "${placeholder "out"}/share/dbus-1/services") + (lib.withFeatureAs true "dbussystembusdir" "${placeholder "out"}/share/dbus-1/system-services") + (lib.withFeatureAs true "systemdsystemunitdir" "${placeholder "out"}/etc/systemd/system") + (lib.withFeatureAs true "systemduserunitdir" "${placeholder "out"}/etc/systemd/user") + (lib.withFeatureAs true "udevdir" "${placeholder "out"}/lib/udev") + ]; + + makeFlags = [ + "rulesdir=${placeholder "out"}/lib/udev/rules.d" + ]; + + # Work around `make install' trying to create /var/lib/bluetooth. + installFlags = [ + "statedir=$(TMPDIR)/var/lib/bluetooth" + ]; + + doCheck = stdenv.hostPlatform.isx86_64; + + postInstall = + let + pythonPath = with python3Packages; [ + dbus-python + pygobject3 + ]; + in + '' + # for bluez4 compatibility for NixOS + mkdir $out/sbin + ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd + ln -s ../libexec/bluetooth/obexd $out/sbin/obexd + + # Add extra configuration + rm $out/etc/bluetooth/{main,input,network}.conf + ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf + + # https://github.com/NixOS/nixpkgs/issues/204418 + ln -s /etc/bluetooth/input.conf $out/etc/bluetooth/input.conf + ln -s /etc/bluetooth/network.conf $out/etc/bluetooth/network.conf + + # Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez + for files in $(find tools/ -type f -perm -755); do + filename=$(basename $files) + install -Dm755 tools/$filename $out/bin/$filename + done + install -Dm755 attrib/gatttool $out/bin/gatttool + '' + lib.optionalString installTests '' + mkdir -p $test/{bin,test} + cp -a test $test + pushd $test/test + for t in \ + list-devices \ + monitor-bluetooth \ + simple-agent \ + test-adapter \ + test-device \ + test-thermometer \ + ; do + ln -s ../test/$t $test/bin/bluez-$t + done + popd + wrapPythonProgramsIn $test/test "$test/test ${toString pythonPath}" + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "https://www.bluez.org/"; + description = "Official Linux Bluetooth protocol stack"; + changelog = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog?h=${finalAttrs.version}"; + license = with lib.licenses; [ bsd2 gpl2Plus lgpl21Plus mit ]; + mainProgram = "btinfo"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/default.nix b/pkgs/default.nix index 38faa7a9..66a26a5f 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -37,6 +37,8 @@ in }; }; + bluez-5_76 = pkgs.callPackage ./bluez { }; + # python packages pythonPackagesExtensions = pkgs.pythonPackagesExtensions ++ [ (