From 5bb3bcd028b9c634e8cab35485a0883c03f3b495 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 27 Jan 2019 15:33:33 +0000 Subject: firefox-unwrapped: fix drmSupport option EME is enabled by default, so adding --enable-eme=widevine is a noop. This means that firefox was always being built with DRM support, even with drmSupport set to false. --- nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 5d2232e08694..36a7730a90b6 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -228,7 +228,7 @@ stdenv.mkDerivation rec { ++ flag gssSupport "negotiateauth" ++ flag webrtcSupport "webrtc" ++ flag crashreporterSupport "crashreporter" - ++ lib.optional drmSupport "--enable-eme=widevine" + ++ lib.optional (!drmSupport) "--disable-eme" ++ lib.optionals (lib.versionOlder ffversion "60") ([] ++ flag geolocationSupport "mozril-geoloc" -- cgit 1.4.1