Skip to content

libsForQt5.qtwayland: Fix cross#250522

Merged
vcunat merged 1 commit intoNixOS:stagingfrom
OPNA2608:fix/qtwayland_cross
Sep 16, 2023
Merged

libsForQt5.qtwayland: Fix cross#250522
vcunat merged 1 commit intoNixOS:stagingfrom
OPNA2608:fix/qtwayland_cross

Conversation

@OPNA2608
Copy link
Contributor

Description of changes

#227900 will make qtbase cross work which is technically required to test this, but this change should be easy to comprehend even without it.

qtwayland needs wayland libraries for the hostPlatform:

Checking for Wayland client library... yes
Checking for Wayland cursor library... yes
[...]

And wayland-scanner to execute on the buildPlatform:

Checking for wayland-scanner... yes

So without wayland in buildInputs AND nativeBuildInputs the build gives up under cross, because there is no wayland-scanner for buildPlatform:

Running configuration tests...
Checking for Wayland client library... yes
Checking for Wayland cursor library... yes
Checking for wayland-scanner... no
Checking for Wayland EGL library... yes
Checking for wayland-server... yes
Done running configuration tests.

Configure summary:

Qt Wayland Client ........................ no
Qt Wayland Compositor .................... no

When applied onto #227900, this lets me cross-compile up to bambootracker for aarch64-linux:
image

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.11 Release Notes (or backporting 23.05 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.

@OPNA2608 OPNA2608 requested a review from ttuegel as a code owner August 21, 2023 09:42
@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label Aug 21, 2023
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Aug 21, 2023
Build needs to run wayland-scanner, so needs a native wayland.
@OPNA2608 OPNA2608 force-pushed the fix/qtwayland_cross branch from 33b8627 to 2f755a7 Compare August 22, 2023 04:42
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Aug 22, 2023
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Sep 6, 2023
@vcunat vcunat merged commit 8430257 into NixOS:staging Sep 16, 2023
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: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants