From 8d0d78efd9b80a1ea82f138c40fb5505a6fee50f Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Fri, 26 Nov 2021 11:47:14 +0100 Subject: [PATCH] bluez5: add experimental variant --- pkgs/os-specific/linux/bluez/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 2c05a4aa271e..5e81cf6b2c1d 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -13,6 +13,7 @@ , readline , systemd , udev +, withExperimental ? false }: let pythonPath = with python3.pkgs; [ dbus-python @@ -84,7 +85,8 @@ in stdenv.mkDerivation rec { # To provide ciptool, sdptool, and rfcomm (unmaintained) # superseded by new D-Bus APIs "--enable-deprecated" - ]; + ] ++ lib.optional withExperimental "--enable-experimental"; + # Work around `make install' trying to create /var/lib/bluetooth. installFlags = [ "statedir=$(TMPDIR)/var/lib/bluetooth" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c186c5af42b..7d68eeea80df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21814,6 +21814,10 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez { }; + bluez5-experimental = callPackage ../os-specific/linux/bluez { + withExperimental = true; + }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { # pulseaudio-modules-bt is most likely to be used with pulseaudioFull pulseaudio = pulseaudioFull;