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

qt5: use depsTargetTargetPropagated for self.qtbase.dev #227901

Closed
wants to merge 4 commits into from
Closed

qt5: use depsTargetTargetPropagated for self.qtbase.dev #227901

wants to merge 4 commits into from

Commits on Jun 21, 2023

  1. qt5.wrapQtAppsHook: move libs to depsTargetTargetPropagated 

    https://github.com/NixOS/nixpkgs/blob/master/doc/builders/special/makesetuphook.section.md
    @Artturin
    Artturin authored and Adam Joseph committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    4e197fe View commit details
    Browse the repository at this point in the history

  2. frescobaldi: fix 

    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
    @Artturin
    Artturin authored and Adam Joseph committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    e5f16cf View commit details
    Browse the repository at this point in the history

  3. qtbase: fix cross 

    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.
    Adam Joseph committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    8272a6b View commit details
    Browse the repository at this point in the history

  4. qt5: use depsTargetTargetPropagated for self.qtbase.dev 

    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
```
    Adam Joseph committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    7988fc9 View commit details
    Browse the repository at this point in the history