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: add cmake to devshell and create a "wlroots-ready" devshell #1155

Merged
merged 3 commits into from
Dec 4, 2022

Conversation

FlafyDev
Copy link
Contributor

@FlafyDev FlafyDev commented Dec 3, 2022

Describe your PR, what does it fix/add?

  • fixes sh: line 1: cmake: command not found when running make debug by adding cmake as a nativeBuildInput.

  • adds a wlroots-ready devshell which puts wlroots in the devshell so nix compiles it.
    Especially useful for NixOS since make config can't install wlroots: (no /usr/include)

Installing subdir /mnt/general/repos/flafydev/Hyprland/subprojects/wlroots/include/wlr to /usr/include/wlr
Installation failed due to insufficient permissions.

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

none

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

ready for review/merge.

@vaxerski
Copy link
Member

vaxerski commented Dec 3, 2022

@fufexan

@fufexan
Copy link
Member

fufexan commented Dec 3, 2022

Why do this instead of building with meson?

@FlafyDev
Copy link
Contributor Author

FlafyDev commented Dec 3, 2022

Why do this instead of building with meson?

Ah I was not aware building with meson was an option. But I still think the devshell should allow support for compiling with cmake. The wiki says it's the recommended way and it documents more for cmake than meson(like https://wiki.hyprland.org/Contributing-and-Debugging )

@fufexan
Copy link
Member

fufexan commented Dec 3, 2022

Alright. I think the default shell should have wlroots in it already, so no need for another one.

@FlafyDev
Copy link
Contributor Author

FlafyDev commented Dec 3, 2022

Alright. I think the default shell should have wlroots in it already, so no need for another one.

done

Copy link
Member

@fufexan fufexan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fufexan fufexan merged commit ea2ef63 into hyprwm:main Dec 4, 2022
fufexan pushed a commit that referenced this pull request Dec 5, 2022
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.

None yet

3 participants