From feee2235b52930511cbba6495b49e8cf8dc557f3 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sun, 12 Aug 2018 13:32:38 +0200 Subject: [PATCH] firefoxWrapper: Fail if deprecated enableVLC option exists --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d2e7c59faff8..38d596480328 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -43,6 +43,9 @@ let plugins = assert !(jre && icedtea); + if builtins.hasAttr "enableVLC" cfg + then throw "The option \"${browserName}.enableVLC\" has been removed since Firefox no longer supports npapi plugins" + else ([ ] ++ lib.optional enableAdobeFlash flashplayer ++ lib.optional (cfg.enableDjvu or false) (djview4)