diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 083c33cee838..9feaf2a57f06 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -47,12 +47,6 @@ gdbm, withReadline ? !withMinimalDeps && !stdenv.hostPlatform.isWindows, readline, - x11Support ? false, - tcl, - tk, - tclPackages, - libX11, - xorgproto, # splicing/cross pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}", @@ -114,8 +108,6 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -assert x11Support -> tcl != null && tk != null && xorgproto != null && libX11 != null; - assert bluezSupport -> bluez != null; assert lib.assertMsg ( @@ -280,12 +272,6 @@ let ++ optionals withReadline [ readline ] - ++ optionals x11Support [ - libX11 - tcl - tk - xorgproto - ] ); hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); @@ -446,11 +432,6 @@ stdenv.mkDerivation (finalAttrs: { + optionalString mimetypesSupport '' substituteInPlace Lib/mimetypes.py \ --replace-fail "@mime-types@" "${mailcap}" - '' - + optionalString (pythonOlder "3.13" && x11Support && ((tclPackages.tix or null) != null)) '' - substituteInPlace "Lib/tkinter/tix.py" --replace-fail \ - "os.environ.get('TIX_LIBRARY')" \ - "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'" ''; env = { @@ -581,10 +562,6 @@ stdenv.mkDerivation (finalAttrs: { if stdenv.hostPlatform.isAarch64 then "uint128" else "x64" }' '' - + optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") '' - export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}" - export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include" - '' + optionalString stdenv.hostPlatform.isWindows '' export NIX_CFLAGS_COMPILE+=" -Wno-error=incompatible-pointer-types" '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b877a611f96..54dd9f502ab9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6206,37 +6206,31 @@ with pkgs; self = python3Full; pythonAttr = "python3Full"; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - x11Support = true; }; python310Full = python310.override { self = python310Full; pythonAttr = "python310Full"; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - x11Support = true; }; python311Full = python311.override { self = python311Full; pythonAttr = "python311Full"; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - x11Support = true; }; python312Full = python312.override { self = python312Full; pythonAttr = "python312Full"; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - x11Support = true; }; python313Full = python313.override { self = python313Full; pythonAttr = "python313Full"; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - x11Support = true; }; python314Full = python314.override { self = python314Full; pythonAttr = "python314Full"; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - x11Support = true; }; # https://py-free-threading.github.io