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

firefox: ensure pipewire is only enabled with wayland & webrtc #99902

Merged
merged 1 commit into from Oct 7, 2020

Conversation

andir
Copy link
Member

@andir andir commented Oct 6, 2020

Motivation for this change

This ensures that we aren't applying any of the experiemental pipewire
patches when the dependencies aren't enabled. As of now pipewire only
works with wayland and webrtc. If either of them are not activated we
can't build with pipewireSupport and we should not.

This is the follow-up to the changes I added to #99692.

Things done
  • built firefox with pipewire and without, ensured that wayland & webrtc must be on for eval to succeed

This ensures that we aren't applying any of the experiemental pipewire
patches when the dependencies aren't enabled. As of now pipewire only
works with wayland and webrtc. If either of them are not activated we
can't build with pipewireSupport and we should not.
@ofborg ofborg bot requested a review from edolstra October 6, 2020 21:20
@andir andir merged commit bffeb5f into NixOS:master Oct 7, 2020
@andir andir deleted the firefox-pipewire-optional branch October 7, 2020 20:37
@@ -69,6 +70,7 @@
}:

assert stdenv.cc.libc or null != null;
assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "pipewireSupport requires both wayland and webrtc support.";
Copy link
Contributor

Choose a reason for hiding this comment

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

assert pipewireSupport -> ((!waylandSupport || !webrtcSupport) -> throw "pipewireSupport requires both wayland and webrtc support.");

it is difficult to read without braces.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants