Skip to content

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

Merged
adisbladis merged 1 commit intoNixOS:masterfrom
Artturin:python3fixcross
Jun 16, 2022
Merged

python3: fix wrong platform libs when cross-compiling#177888
adisbladis merged 1 commit intoNixOS:masterfrom
Artturin:python3fixcross

Conversation

@Artturin
Copy link
Copy Markdown
Member

see #169475 (comment)

patch by adisbladis

Co-authored-by: adisbladis adisbladis@gmail.com

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

see NixOS#169475 (comment)

patch by adisbladis

Co-authored-by: adisbladis <adisbladis@gmail.com>
@Artturin Artturin requested a review from FRidh as a code owner June 16, 2022 13:57
@Artturin Artturin added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jun 16, 2022
@Artturin Artturin requested a review from adisbladis June 16, 2022 13:58
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jun 16, 2022
@SuperSandro2000
Copy link
Copy Markdown
Member

Maybe we should also update the comment?

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 16, 2022
@@ -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

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

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.

@github-actions
Copy link
Copy Markdown
Contributor

Successfully created backport PR #177945 for release-22.05.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants