diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 459523ea6169..4dd8fa743121 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -25,7 +25,7 @@ , withNgspice ? !stdenv.isDarwin , libngspice , withScripting ? true -, python311 +, python3 , addons ? [ ] , debug ? false , sanitizeAddress ? false @@ -122,14 +122,10 @@ let else versionsImport.${baseName}.libVersion.version; wxGTK = wxGTK32; - # KiCAD depends on wxWidgets, which uses distutils (removed in Python 3.12) - # See also: https://github.com/wxWidgets/Phoenix/issues/2104 - # Eventually, wxWidgets should support Python 3.12: https://github.com/wxWidgets/Phoenix/issues/2553 - # Until then, we use Python 3.11 which still includes distutils - python = python311; + python = python3; wxPython = python.pkgs.wxpython; addonPath = "addon.zip"; - addonsDrvs = map (pkg: pkg.override { inherit addonPath python; }) addons; + addonsDrvs = map (pkg: pkg.override { inherit addonPath python3; }) addons; addonsJoined = runCommand "addonsJoined" @@ -161,7 +157,7 @@ stdenv.mkDerivation rec { # Common libraries, referenced during runtime, via the wrapper. passthru.libraries = callPackages ./libraries.nix { inherit libSrc; }; - passthru.callPackage = newScope { inherit addonPath python; }; + passthru.callPackage = newScope { inherit addonPath python3; }; base = callPackage ./base.nix { inherit stable testing baseName; inherit kicadSrc kicadVersion; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8d19bd7226e..8c379a5c1e2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6663,7 +6663,7 @@ self: super: with self; { khanaa = callPackage ../development/python-modules/khanaa {}; kicad = toPythonModule (pkgs.kicad.override { - python311 = python; + python3 = python; }).src; kinparse = callPackage ../development/python-modules/kinparse { };