Install files using CMake, use CMake for Nix #5667
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fufexan
force-pushed
the
cmake
branch
2 times, most recently
from
645c6cb to
86234c2
Compare
vaxerski
reviewed
Apr 21, 2024
vaxerski
reviewed
Apr 21, 2024
fufexan
force-pushed
the
cmake
branch
3 times, most recently
from
d765b51 to
e5c8802
Compare
fufexan
force-pushed
the
cmake
branch
2 times, most recently
from
f7cfd88 to
57818eb
Compare
vaxerski
force-pushed
the
main
branch
6 times, most recently
from
fe9d852 to
ecf282d
Compare
13 tasks
jbeich
reviewed
May 2, 2024
fufexan
force-pushed
the
cmake
branch
3 times, most recently
from
6eee9a0 to
d154bb7
Compare
vaxerski
reviewed
May 4, 2024
|
@vaxerski I've also removed all occurrences of |
|
@outfoxxed can you test when you have the time? |
|
Headers seem to work now, hy3 built successfully. |
vaxerski
approved these changes
May 5, 2024
Build using submodules instead of patching the build process and using Nix derivations of the subprojects. From this commit on, you'll have to change the Hyprland flake url to `git+https://github.com/hyprwm/Hyprland?submodules=1`
- Clone repo recursively - Update Nix install action - Remove wlroots update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your PR, what does it fix/add?
CMake now installs files directly (through
cmake --install ./build). The Makefile commands have a warning that directs users to the appropriate commands.Nix now uses CMake for building. We also no longer patch the build process to avoid building subprojects.
This simplifies things on the building part, but complicates them a bit on the UX part.
In order to test these changes, you will have to do so with the following command:
$ nix build 'git+https://github.com/hyprwm/Hyprland?ref=cmake&submodules=1'Closes #4956.
Closes #2313.
Important
I may revert back to patching the build process and using derivations for subprojects instead, if this method proves to be too unergonomic.
Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
CMake run from the command line seems to build fine, but when built with Nix it seems to build twice for some reason. Will have to look into the CMake and Ninja setup hooks.
Another thing to note is, in Nix at least, the XWayland package contains a pkg-config file that exposes
includedirandCflags, which are useless due to XWayland not including headers in the package. They have to be patched out.Is it ready for merging, or does it need work?
No. Please test it and report back.
TODO:
CONFIGURE_DEPENDS)cmakeConfigurePhase,ninjaBuildPhaseandninjaInstallPhase)