Merge pull request #44934 from srhb/warn-on-firefox-vlc

firefoxWrapper: Fail if deprecated enableVLC option exists
2018-08-13 19:35:07 +02:00
parent 249ba3d3ed feee2235b5
commit 46516d8722
1 changed files with 3 additions and 0 deletions
--- 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)