Skip to content
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

Jump to bottom

zbar: fix cross compilation #237330

Merged
merged 1 commit into from Jun 15, 2023
Merged

zbar: fix cross compilation #237330

merged 1 commit into from Jun 15, 2023

Conversation

ghost
Copy link

@ghost ghost commented Jun 12, 2023

Description of changes

This commit fixes cross compilation for zbar by adding qtbase to its nativeBuildInputs.

Things done
  • Built on platform(s)
    • aarch64-linux (cross from x86_64-linux)
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jun 12, 2023
@ofborg ofborg bot requested review from delroth and 7c6f434c June 12, 2023 10:58
@delroth
Copy link
Contributor

delroth commented Jun 12, 2023

lib.optionals enableVideo to match the buildInputs dependency?

zbar: fix cross compilation
95a4cda 
This commit fixes cross compilation for zbar by adding `qtbase` to
its `nativeBuildInputs`.
@ghost
Copy link
Author

ghost commented Jun 15, 2023

lib.optionals enableVideo to match the buildInputs dependency?

Thanks for catching that!

@7c6f434c 7c6f434c merged commit 5a89132 into NixOS:master Jun 15, 2023
@ghost ghost deleted the pr/zbar/fixcross branch June 15, 2023 20:12
@Artturin Artturin mentioned this pull request Jan 29, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@delroth delroth Awaiting requested review from delroth

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@delroth @7c6f434c