From 251d713d0cf1e5b40ca304e6a335e705ee6ede1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 29 Aug 2025 01:52:41 +0200 Subject: [PATCH] cpython: build with bluetooth support in default build Closes: #341001 --- .../interpreters/python/cpython/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 9feaf2a57f06..0b2a3e1a59d8 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -38,8 +38,8 @@ windows, # optional dependencies - bluezSupport ? false, - bluez, + bluezSupport ? !withMinimalDeps && stdenv.hostPlatform.isLinux, + bluez-headers, mimetypesSupport ? !withMinimalDeps, mailcap, tzdata, @@ -108,8 +108,6 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -assert bluezSupport -> bluez != null; - assert lib.assertMsg ( enableFramework -> stdenv.hostPlatform.isDarwin ) "Framework builds are only supported on Darwin."; @@ -155,8 +153,7 @@ let passthru = let # When we override the interpreter we also need to override the spliced versions of the interpreter - # bluez is excluded manually to break an infinite recursion. - inputs' = lib.filterAttrs (n: v: n != "bluez" && n != "passthruFun" && !lib.isDerivation v) inputs; + inputs' = lib.filterAttrs (n: v: n != "passthruFun" && !lib.isDerivation v) inputs; # Memoization of the splices to avoid re-evaluating this function for all combinations of splices e.g. # python3.pythonOnBuildForHost.pythonOnBuildForTarget == python3.pythonOnBuildForTarget by consuming # __splices as an arg and using the cache if populated. @@ -257,7 +254,7 @@ let zstd ] ++ optionals bluezSupport [ - bluez + bluez-headers ] ++ optionals stdenv.hostPlatform.isMinGW [ windows.dlfcn