-
-
Notifications
You must be signed in to change notification settings - Fork 913
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
Nix: revert to using CMake, drop ninja #7784
base: main
Are you sure you want to change the base?
Conversation
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.
diff lgtm
I'd like to propose waiting a few days before a merge for testing, to make sure jo new bugs are introduced
@NotAShelf are you gonna test? |
I will tomorrow or on monday. Currently travelling and my pc is all packed up. |
Tested with diff --git a/flake.nix b/flake.nix
index 706c330..8db9dfd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1"; # Declarative Flatpak support for NixOS
## DESKTOP ENVIRONMENT ##
- hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; # Hyprland, a Wayland WM, use git submodules too
+ hyprland.url = "git+https://github.com/hyprwm/Hyprland?ref=refs/pull/7784/merge&submodules=1"; # Hyprland, a Wayland WM, use git submodules too
rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
## MISC PACKAGES ## |
@NotAShelf have you had a chance to test this? |
I forgot about it, thanks for the reminder. Will test it this evening (roughly 2-3 hours tops?) |
Build seems fine, I see nothing out of ordinary while running Hyprland either. LGTM |
@fufexan how are you building in a nix shell? after the cmake 0.30 requirement I can't use |
If you're in a bash |
Looking at CI, it seems Meson builds 2 minutes faster than CMake (and I haven't added mold to it yet) |
gh CI is not reliable to time stuff especially if its just 1 run |
Nor is my laptop for that matter, we need an isolated machine to run proper tests. |
Describe your PR, what does it fix/add?
Revert #7774 and #7778.
Reason: CMake + Makefile + Mold builds the fastest out of the tested configurations. See #7774 (comment) for an ugly graph.
Also use stdenvAdapters.keepDebugInfo when debug is enabled, and handle applying all configured adapters.done on maindevShell now inherits the default package's stdenv so that it only needs to be set indone on mainnix/overlays.nix
.Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
CC: @JohnRTitor @diniamo @NotAShelf
Is it ready for merging, or does it need work?
Should be ready.