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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only set enable-features if the user hasn't #261

Merged
merged 1 commit into from
Sep 7, 2021

Conversation

yu-re-ka
Copy link
Contributor

@yu-re-ka yu-re-ka commented Sep 6, 2021

Fix the issue mentioned in my comment in #256


Here's what your changelog entry will look like:

馃悰 Bug Fixes

  • Only set enable-features if the user hasn't (#261). Contributed by yu-re-ka.

Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

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

thanks!

@turt2live turt2live merged commit c16c473 into element-hq:develop Sep 7, 2021
Ma27 added a commit to Ma27/nixpkgs that referenced this pull request Sep 13, 2021
See upstream PR#261[1] for further reference. Previously, the
`enable-features`-setting was entirely discarded due to an earlier
regression resulting in an attempt to start `element-desktop` in
Wayland-mode without all necessary components.

Closes NixOS#137377

[1] element-hq/element-desktop#261
yu-re-ka pushed a commit to NixOS/nixpkgs that referenced this pull request Sep 13, 2021
See upstream PR#261[1] for further reference. Previously, the
`enable-features`-setting was entirely discarded due to an earlier
regression resulting in an attempt to start `element-desktop` in
Wayland-mode without all necessary components.

Closes #137377

[1] element-hq/element-desktop#261
@yu-re-ka
Copy link
Contributor Author

Can we get this into the next 1.8.x release? The new feature that broke it was added in a bugfix release (1.8.2) after all.

@turt2live
Copy link
Member

It will be in the next scheduled release, yes.

Ma27 added a commit to Ma27/nixpkgs that referenced this pull request Sep 13, 2021
See upstream PR#261[1] for further reference. Previously, the
`enable-features`-setting was entirely discarded due to an earlier
regression resulting in an attempt to start `element-desktop` in
Wayland-mode without all necessary components.

Closes NixOS#137377

[1] element-hq/element-desktop#261

(cherry picked from commit 5a0d0ec)
yu-re-ka pushed a commit to NixOS/nixpkgs that referenced this pull request Sep 14, 2021
See upstream PR#261[1] for further reference. Previously, the
`enable-features`-setting was entirely discarded due to an earlier
regression resulting in an attempt to start `element-desktop` in
Wayland-mode without all necessary components.

Closes #137377

[1] element-hq/element-desktop#261

(cherry picked from commit 5a0d0ec)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants