qt5: use depsTargetTargetPropagated for self.qtbase.dev #227901
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
requested review from
matthewbauer,
bkchr,
OPNA2608,
abbradar,
periklis and
qknight
ghost
changed the title
ghost
marked this pull request as draft
broken by "qt5.wrapQtAppsHook: move libs to depsTargetTargetPropagated" qtbase propagates a lot of stuff frescobaldi> msgcat -o - frescobaldi/cs.po userguide/cs.po | msgfmt -o ../frescobaldi_app/i18n/cs.mo - frescobaldi> sh: line 1: msgcat: command not found frescobaldi> sh: line 1: msgfmt: command not found
This commit fixes builds of `pkgsCross.*.qtbase` by adding the buildPlatform compiler to depsBuildBuild in qtbase.nix and qtModule.nix. The `qtbase` build machinery expects to find it in the $PATH in unprefixed form.
Without this, two different copies of qtbase to wind up in the
buildInputs for cross compiled builds, leading to this sort of
breakage for PyQt:
```
Error: detected mismatched Qt dependencies:
/nix/store/8g7xc01pj6y569qfyf5ccfbs5dr87wwq-qtbase-aarch64-unknown-linux-gnu-5.15.9-dev
/nix/store/w19n5gzlx4fv63a3dn5965s661nhakv9-qtbase-5.15.9-dev
```
ghost
marked this pull request as ready for review
ghost
mentioned this pull request
12 tasks
ghost
closed this
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Without this two different copies of qtbase to wind up in the buildInputs for cross compiled builds, leading to this sort of breakage for PyQt:
Builds upon:
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)