Skip to content

python3: fix wrong platform libs when cross-compiling #177888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adisbladis merged 1 commit into from
Jun 16, 2022
Merged

python3: fix wrong platform libs when cross-compiling #177888

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/python/cpython/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ let

passthru = let
# When we override the interpreter we also need to override the spliced versions of the interpreter
Copy link
Copy Markdown
Member

@SuperSandro2000 SuperSandro2000 Jun 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify: i meant this comment. I am not sure if it is up to date anymore.

Copy link
Copy Markdown
Member

@adisbladis adisbladis Jun 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is up to date and correct. The difference here is that passthruFun can carry derivations in the function closure too that are not filtered out.

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;
Expand Down