Skip to content
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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Nix: revert to using CMake, drop ninja #7784

wants to merge 4 commits into from

Conversation

fufexan
Copy link
Member

@fufexan fufexan commented Sep 13, 2024

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 main

devShell now inherits the default package's stdenv so that it only needs to be set in nix/overlays.nix. done on main

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.

nix/default.nix Outdated Show resolved Hide resolved
nix/default.nix Outdated Show resolved Hide resolved
nix/default.nix Outdated Show resolved Hide resolved
nix/default.nix Outdated Show resolved Hide resolved
Copy link
Member

@NotAShelf NotAShelf left a 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

@fufexan
Copy link
Member Author

fufexan commented Sep 14, 2024

@NotAShelf are you gonna test?

@NotAShelf
Copy link
Member

I will tomorrow or on monday. Currently travelling and my pc is all packed up.

@JohnRTitor
Copy link
Contributor

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 ##

@fufexan
Copy link
Member Author

fufexan commented Sep 18, 2024

@NotAShelf have you had a chance to test this?

@NotAShelf
Copy link
Member

I forgot about it, thanks for the reminder. Will test it this evening (roughly 2-3 hours tops?)

@fufexan fufexan mentioned this pull request Sep 18, 2024
@NotAShelf
Copy link
Member

Build seems fine, I see nothing out of ordinary while running Hyprland either.

LGTM

@leiserfg
Copy link
Contributor

@fufexan how are you building in a nix shell? after the cmake 0.30 requirement I can't use make build anymore so it became harder to contribute.

@fufexan
Copy link
Member Author

fufexan commented Sep 19, 2024

@fufexan how are you building in a nix shell? after the cmake 0.30 requirement I can't use make build anymore so it became harder to contribute.

If you're in a bash nix develop shell, you can run patchPhase to apply the relevant patches. Then you can run whatever else.

@fufexan
Copy link
Member Author

fufexan commented Sep 19, 2024

Looking at CI, it seems Meson builds 2 minutes faster than CMake (and I haven't added mold to it yet)
https://github.com/hyprwm/Hyprland/actions/runs/10927442884/job/30333607100 (main branch)
https://github.com/hyprwm/Hyprland/actions/runs/10861533522/job/30143545391?pr=7784 (this PR)

@vaxerski
Copy link
Member

gh CI is not reliable to time stuff especially if its just 1 run

@fufexan
Copy link
Member Author

fufexan commented Sep 20, 2024

Nor is my laptop for that matter, we need an isolated machine to run proper tests.

@fufexan fufexan changed the title Nix: revert to using CMake, drop ninja and use mold Nix: revert to using CMake, drop ninja Sep 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Nix NixOS issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants