-
-
Notifications
You must be signed in to change notification settings - Fork 935
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
also test cross build #6344
also test cross build #6344
Conversation
cc @fufexan |
Great addition! We should also add the cross build to the CI matrix. |
Maybe, but first I would appreciate help with the issue. Thanks! |
Sorry, adding those packages where? I've added hwdata and basically mimicked the |
Managed to fix the However,
|
This is the same issue I also ended up having:
|
Looks like building with Meson worked, but I can't get CMake to select the right wayland-scanner. |
Do we need both to build hyprland? I wouldn't mind if cross-compiling would work with one of the two as a good first step. |
Hyprland can build fine in Meson it seems, so assuming we can override only the pkgsCross derivation, we can introduce Meson before CMake (so its configure hook takes priority) in |
Can we not also just disable cmake everywhere like this?
|
We can, I was just not aware of that option. |
1184395
to
b16fb97
Compare
I've removed hwdata as it is no longer needed in Hyprland itself, but in aquamarine. So I fixed aquamarine's cross build.
@Mic92 do you have a clue why this happens or how to fix it? EDIT: we'll also have to create a toggle for udis, since it only works on x86. |
Do we still need cmake? I thought we could just use meson instead. |
Sure, we can use meson for the cross build. However I wanted to make sure CMake can also cross-compile as it's the prevalent build system used throughout hyprwm. |
I still would want to drop meson |
5bd8e6a
to
171f77f
Compare
171f77f
to
eb30e61
Compare
@Mic92 I've managed to fix this (along with the previously-failing aquamarine). We're currently building Hyprland with Meson, but when testing, the cross compilation also worked with CMake. This is relevant as we may (once again) go back to using CMake. When building I've also been noticing that |
Got the patch merged in Nixpkgs NixOS/nixpkgs#343074. Will wait a few days for it to propagate to unstable, and then merge this PR. |
eb30e61
to
5b6dae1
Compare
5b6dae1
to
852f921
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thank you @Mic92
@fufexan thank you as well! |
Describe your PR, what does it fix/add?
We noticed that a recent update broken cross compilation in nixpkgs and therefore added tests for this upstream - I saw that this project uses the magic-nix-cache so hopefully all cross-build dependencies will be cached.
CMake Error at /nix/store/q1nssraba326p2kp6627hldd2bhg254c-cmake-3.29.2/share/cmake-3.29/Modules/FindPkgConfig.cmake:634 (message):
The following required packages were not found:
Adding
hwdata
andhyprwayland-scanner
seems to make the pkg-config happy, but than it looks like it's pullinghyprwayland-scanner
for the wrong architecture. I saw that your meson build seems to be somewhat cross-compiling aware, so I am not quite sure what is going on here.Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
Is it ready for merging, or does it need work?