python3.pkgs.setuptools-rust: Revert "adjust setupHook inclusion condition" (#482866)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user