Skip to content

zbar: fix cross compilation#237330

Merged
7c6f434c merged 1 commit intomasterfrom
unknown repository
Jun 15, 2023
Merged

zbar: fix cross compilation#237330
7c6f434c merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@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 7c6f434c and delroth June 12, 2023 10:58
@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 Jun 12, 2023
@delroth
Copy link
Copy Markdown
Contributor

delroth commented Jun 12, 2023

lib.optionals enableVideo to match the buildInputs dependency?

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

ghost commented Jun 15, 2023

lib.optionals enableVideo to match the buildInputs dependency?

Thanks for catching that!

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels Jun 15, 2023
@7c6f434c 7c6f434c merged commit 5a89132 into NixOS:master Jun 15, 2023
@ghost ghost deleted the pr/zbar/fixcross branch June 15, 2023 20:12
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: 0 This PR does not cause any 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