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

Fix the pc file paths, fix hyprpm #5946

Merged
merged 1 commit into from
May 8, 2024
Merged

Fix the pc file paths, fix hyprpm #5946

merged 1 commit into from
May 8, 2024

Conversation

vaxerski
Copy link
Member

@vaxerski vaxerski commented May 8, 2024

Fixes #5896

Let's be real @fufexan, we can't sacrifice 99% of distros just because nix uses an idiotic storage system.

Feel free to patch the pc for nix (I mean you used to patch everything for nix anyways)

Supersedes #5929

Please verify it works.

@vaxerski
Copy link
Member Author

vaxerski commented May 8, 2024

seems to be working on my end.

@RyuuyaS
Copy link

RyuuyaS commented May 8, 2024

On my end still have error code 2, missing epoll-shim.

@paulhaider
Copy link

I'm also still getting the same error code 2

@vaxerski
Copy link
Member Author

vaxerski commented May 8, 2024

epoll-shim

isnt that a dep you just have to install?

@vaxerski
Copy link
Member Author

vaxerski commented May 8, 2024

I'm also still getting the same error code 2

post hyprpm update -v

@paulhaider
Copy link

paulhaider commented May 8, 2024

I'm also still getting the same error code 2

post hyprpm update -v

hyprpm_3bef59f.txt

@fufexan
Copy link
Member

fufexan commented May 8, 2024

Just pushed an update to my PR. Achieves the same thing likely.

@vaxerski
Copy link
Member Author

vaxerski commented May 8, 2024

image
wrong branch is parsed somehow

@vaxerski
Copy link
Member Author

vaxerski commented May 8, 2024

@fufexan no, you still miss hyprland/wlroots-hyprland/

@vaxerski
Copy link
Member Author

vaxerski commented May 8, 2024

anyways since fuf's MR accomplishes the same, I'll merge this.

@vaxerski vaxerski merged commit d1ad490 into main May 8, 2024
19 checks passed
@rtgiskard
Copy link
Contributor

rtgiskard commented May 11, 2024

Currently, CMake is installing wlroots-hyprland's headers into hyprland/wlr, however the hyprland.pc.in it's wrote hyprland/wlroots-hyprland/, should this be synced?

Original wlroots' header is installed into $PREFIX/wlr, safe to use $PREFIX/hyprland/wlr here. I think it's better to update the pc file rather than rename manually with the packager.

@fufexan
Copy link
Member

fufexan commented May 11, 2024

@rtgiskard going to be fixed in https://github.com/hyprwm/Hyprland/pull/6002/files. We needed to patch the includedir of wlroots-hyprland so that meson places the files correctly. CMake already works like that.

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.

hyprpm update - failed to install headers with error code 2
5 participants