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.

Sign up for GitHub

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

Jump to bottom

firefox: warn users that drmSupport=false argument does nothing #171929

Closed
wants to merge 2 commits into from
Closed

firefox: warn users that drmSupport=false argument does nothing #171929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ac9d95
firefox: warn users that drmSupport=false argument does nothing
May 7, 2022
a1bbf3f
reduce wordiness
May 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,17 @@
unmaintained
</para>
</listitem>
<listitem>
<para>
<literal>firefox</literal> no longer allows the
<literal>drmSupport</literal> argument to be set to
<literal>false</literal>; this had previously passed the
<literal>--disable-eme</literal> configuration flag, which
Firefox
<link xlink:href="https://hg.mozilla.org/releases/mozilla-aurora/rev/afc827378c1075c2d849f07f64a4021235a51586">began
silently ignoring</link> in September of 2016.
</para>
</listitem>
<listitem>
<para>
<literal>pkgs._7zz</literal> is now correctly licensed as
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2205.section.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,8 @@ In addition to numerous new and upgraded packages, this release has the followin

- `pkgs.docbookrx` was removed since it's unmaintained

- `firefox` no longer allows the `drmSupport` argument to be set to `false`; this had previously passed the `--disable-eme` configuration flag, which Firefox [began silently ignoring](https://hg.mozilla.org/releases/mozilla-aurora/rev/afc827378c1075c2d849f07f64a4021235a51586) in September of 2016.

- `pkgs._7zz` is now correctly licensed as LGPL3+ and BSD3 with optional unfree unRAR licensed code

- The `vim.customize` function produced by `vimUtils.makeCustomizable` now has a slightly different interface:
Expand Down
19 changes: 12 additions & 7 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,7 @@

# digital rights managemewnt

# This flag controls whether Firefox will show the nagbar, that allows
# users at runtime the choice to enable Widevine CDM support when a site
# requests it.
# Controlling the nagbar and widevine CDM at runtime is possible by setting
# `browser.eme.ui.enabled` and `media.gmp-widevinecdm.enabled` accordingly
, drmSupport ? true
, drmSupport ? true # see assert below

## other

Expand Down Expand Up @@ -135,6 +130,17 @@
assert stdenv.cc.libc or null != null;
assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "${pname}: pipewireSupport requires both wayland and webrtc support.";

assert !drmSupport -> throw ''
Mozilla silently changed this compile time option to a no-op in 2016
with this commit:

https://hg.mozilla.org/releases/mozilla-aurora/rev/afc827378c1075c2d849f07f64a4021235a51586

Your best bet at this point is to use "Enterprise Policies":

https://github.com/mozilla/policy-templates/blob/master/README.md#encryptedmediaextensions
'';

let
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];

Expand Down Expand Up @@ -310,7 +316,6 @@ buildStdenv.mkDerivation ({
++ flag gssSupport "negotiateauth"
++ flag webrtcSupport "webrtc"
++ flag crashreporterSupport "crashreporter"
++ lib.optional (!drmSupport) "--disable-eme"

++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
else [ "--disable-debug" "--enable-optimize" ])
Expand Down