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 xwayland config option for nix #587

Merged
merged 1 commit into from
Aug 27, 2022
Merged

Conversation

nicholascioli
Copy link
Contributor

Describe your PR, what does it fix/add?

When building Hyprland in nix using the following home-manager recipe:

{}:

{
  wayland.windowManager.hyprland = {
    enable = true;
    xwayland = false;
  };
}

The default nix configuration still makes reference to a compile argument NO_XWAYLAND, but the meson_options.txt only makes reference to xwayland. This causes the build to fail with:

meson.build:1:0: ERROR: Unknown options: "NO_XWAYLAND"

This change fixes that issue.

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

This still doesn't allow you to build Hyprland without having XWayland installed (#178), but it should at least allow for valid nix configurations for when that issue gets resolved.

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

The change does not touch any of the actual code, but it might require the root flake.nix / flake.lock to be updated to bump the patch version.

When building Hyprland in nix using the following home-manager recipe:

```nix
wayland.windowManager.hyprland = {
    enable = true;
    xwayland = false;
  };
```

The default nix configuration still makes reference to a compile argument `NO_XWAYLAND`, but the `meson_options.txt` only makes reference to `xwayland`. This causes the build to fail with:

```
meson.build:1:0: ERROR: Unknown options: "NO_XWAYLAND"
```

This change fixes that issue. This still doesn't allow you to build Hyprland without having XWayland installed (hyprwm#178), but it should at least allow for valid nix configurations for when that issue gets resolved.
@vaxerski
Copy link
Member

@fufexan

@fufexan fufexan merged commit df4c1c0 into hyprwm:main Aug 27, 2022
@fufexan
Copy link
Member

fufexan commented Aug 27, 2022

Thanks!

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