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.

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

pyqt/5.x.nix: fix cross #227902

Closed
wants to merge 5 commits into from
Closed

pyqt/5.x.nix: fix cross #227902

wants to merge 5 commits into from

Commits on Jul 1, 2023

  1. Configuration menu
    Copy the full SHA
    9ba914d 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 authored and Adam Joseph committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    0332a71 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 Jul 1, 2023
    Configuration menu
    Copy the full SHA
    594a027 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 Jul 1, 2023
    Configuration menu
    Copy the full SHA
    9fa609c View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2023

  1. pyqt/5.x.nix: fix cross

    I was able to get PyQt5 to cross compile with this commit.
    Adam Joseph committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    09177d2 View commit details
    Browse the repository at this point in the history