Skip to content

uhd: fix cross#226558

Merged
1 commit merged intomasterfrom
unknown repository
Apr 17, 2023
Merged

uhd: fix cross#226558
1 commit merged intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Apr 17, 2023

Description of changes

This commit adds python3 to nativeBuildInputs in order to fix cross compilation of uhd.

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/)
  • 23.05 Release Notes (or backporting 22.11 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
  • Fits CONTRIBUTING.md.

This commit adds `python3` to `nativeBuildInputs` in order to fix
cross compilation of `uhd`.
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 17, 2023
@ofborg ofborg bot requested review from bjornfor, doronbehar, fpletz and tomberek April 17, 2023 01:25
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 17, 2023
@ghost ghost merged commit a1c17c9 into NixOS:master Apr 17, 2023
@ghost ghost deleted the pr/fixcross/uhd branch April 17, 2023 04:46
pkg-config
python3
]
# If both enableLibuhd_Python_api and enableUtils are off, we don't need
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the PR. It'd be better to add pythonEnv unconditionally to nativeBuildInputs - it'll evaluate to a python environment without any python packages in it.

I remember I was thinking about it when I wrote the comment here, and I haven't checked cross compilation.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It'd also be nice to test cross compilation with enablePythonApi = true;, and comment whether it works or not.

@doronbehar
Copy link
Copy Markdown
Contributor

Also, when there are so many maintainers (4 in this case), it'd be nice to wait more then 4 hours for more approvals, and give more time for them to respond.

@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 18, 2023

Also, when there are so many maintainers (4 in this case), it'd be nice to wait more then 4 hours for more approvals, and give more time for them to respond.

Sorry about that. I have a huge pile of these one-liners from my "cross compile the whole laptop" push. I definitely wait longer when the PR is something nontrivial.

@doronbehar
Copy link
Copy Markdown
Contributor

Also, when there are so many maintainers (4 in this case), it'd be nice to wait more then 4 hours for more approvals, and give more time for them to respond.

Sorry about that. I have a huge pile of these one-liners from my "cross compile the whole laptop" push. I definitely wait longer when the PR is something nontrivial.

It's OK. Feel free to ping me for such cross compile PRs, it's a topic of interest to me as well. I'll also appreciate your review for #226676, and would be interested to learn about your goal with cross compiling uhd.

This pull request was closed.
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 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants