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: build improvements #5952

Merged
merged 6 commits into from
May 10, 2024
Merged

Conversation

andresilva
Copy link
Contributor

@andresilva andresilva commented May 8, 2024

Describe your PR, what does it fix/add?

Fixes populating the version header and removes unused stuff.

Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)

No.

Is it ready for merging, or does it need work?

Yes.

flake.nix Show resolved Hide resolved
@fufexan
Copy link
Member

fufexan commented May 9, 2024

@vaxerski are you alright with the hyprland.pc.in changes? CMake now installs the wlroots headers under @PREFIX@/include/hyprland/wlr. Only meson still installs them to wlroots-hyprland, but I'll change it.

Tested building the plugins, all green.

@vaxerski
Copy link
Member

dont care, as long as shit works

@Agent00Ming
Copy link
Contributor

On arch:

./documents/git/hyprland/build/hyprpm/hyprpm update

! Cloning https://github.com/hyprwm/hyprland, this might take a moment.                                                                                                                                   
✔ cloned                                                                                                                                                                                                  
✔ checked out to running ver                                                                                                                                                                              
! configuring Hyprland                                                                                                                                                                                    
✔ configured Hyprland                                                                                                                                                                                     
✖ failed to install headers with error code 4                                                                                                                                                             
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━  5 / 5  Failed                                                                                                                                        

✖ Headers version mismatch. Please run hyprpm update to fix those.

not sure if this is good or bad

@fufexan
Copy link
Member

fufexan commented May 10, 2024

I hate that error code. I need more info. Thanks for testing though.

Oh, the hyprland-git pkgbuild still uses Meson. I'll fix that too.

@fufexan fufexan force-pushed the nix-build-improvements branch from e1a5186 to 1bbf004 Compare May 10, 2024 22:35
@fufexan
Copy link
Member

fufexan commented May 10, 2024

I've decided the pkg-config stuff + meson are out of scope for this PR, and I'll open a new one for those. Merging as soon as CI passes.

@fufexan fufexan merged commit a8ab1b1 into hyprwm:main May 10, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants