Skip to content

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

Closed
ghost wants to merge 5 commits intomasterfrom
unknown repository
Closed

pyqt/5.x.nix: fix cross#227902
ghost wants to merge 5 commits intomasterfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Apr 24, 2023

Description of changes

I am able to build pkgsCross.aarch64-multiplatform.python3Packages.pyqt5 with this PR.

Includes:

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

I was able to get PyQt5 to cross compile with this commit.

@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation labels Apr 24, 2023
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 24, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Apr 24, 2023
@ghost ghost marked this pull request as ready for review June 21, 2023 05:16
Artturin and others added 4 commits July 1, 2023 13:13
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
Copy link
Author

ghost commented Jul 1, 2023

Fixed merge conflict.

I was able to get PyQt5 to cross compile with this commit.
@ghost ghost closed this Oct 22, 2023
@ghost ghost deleted the pr/pyqt5/fixcross branch October 22, 2023 05:37
This pull request was closed.
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 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant