diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 13ede05bf2b72..b0fd13b6a928c 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -152,8 +152,6 @@ let passthru = let - # When we override the interpreter we also need to override the spliced versions of the interpreter - 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. @@ -170,13 +168,9 @@ let override = attr: let - python = attr.override ( - inputs' - // { - self = python; - __splices = splices; - } - ); + python = attr.override { + self = python; + }; in python; in diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 79158cf1ea639..a13c0e7be526a 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -43,16 +43,11 @@ buildPythonPackage rec { # integrate the setup hook to set up the build environment for cross compilation # this hook is automatically propagated to consumers using setuptools-rust as build-system # - # No need for the setup hook when python.pythonOnTargetForTarget is empty, - # or when the host & target platforms are the same. - # + # Only include the setup hook if python.pythonOnTargetForTarget is not empty. # python.pythonOnTargetForTarget is not always available, for example in # pkgsLLVM.python3.pythonOnTargetForTarget. cross build with pkgsLLVM should not be affected. setupHook = - if - python.pythonOnTargetForTarget == { } - || (lib.systems.equals stdenv.hostPlatform stdenv.targetPlatform) - then + if python.pythonOnTargetForTarget == { } then null else replaceVars ./setuptools-rust-hook.sh {