summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtturin <Artturin@artturin.com>2022-06-16 16:49:18 +0300
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-06-16 22:33:29 +0000
commit8eca77048d95c0289447f210ac591254da24a1fa (patch)
treeec938754551cc179c1f37980320e874273a873dc
parentMerge pull request #177905 from Ma27/backport-grafana (diff)
downloadnixpkgs-origin/backport-177888-to-release-22.05.tar.gz
python3: fix wrong platform libs when cross-compilingorigin/backport-177888-to-release-22.05
see https://github.com/NixOS/nixpkgs/pull/169475#issuecomment-1129517328 patch by adisbladis Co-authored-by: adisbladis <adisbladis@gmail.com> (cherry picked from commit 843b9886800a8e78aaaa01989f1d03cdbf907b88)
-rw-r--r--pkgs/development/interpreters/python/cpython/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 1900296abb7f..d79c685414df 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -85,7 +85,7 @@ let
passthru = let
# When we override the interpreter we also need to override the spliced versions of the interpreter
- inputs' = lib.filterAttrs (_: v: ! lib.isDerivation v) inputs;
+ inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs;
override = attr: let python = attr.override (inputs' // { self = python; }); in python;
in passthruFun rec {
inherit self sourceVersion packageOverrides;