diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-08-13 19:35:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 19:35:07 +0200 |
| commit | 46516d87227b1aa53d9cdb78943eedc0b1544546 (patch) | |
| tree | f745fe7b659a2b8fba67bcec256a0de31e015351 /pkgs/applications | |
| parent | 249ba3d3ed76e34f61ab7bb2024b013f3feaafb9 (diff) | |
| parent | feee2235b52930511cbba6495b49e8cf8dc557f3 (diff) | |
| download | nixlib-46516d87227b1aa53d9cdb78943eedc0b1544546.tar nixlib-46516d87227b1aa53d9cdb78943eedc0b1544546.tar.gz nixlib-46516d87227b1aa53d9cdb78943eedc0b1544546.tar.bz2 nixlib-46516d87227b1aa53d9cdb78943eedc0b1544546.tar.lz nixlib-46516d87227b1aa53d9cdb78943eedc0b1544546.tar.xz nixlib-46516d87227b1aa53d9cdb78943eedc0b1544546.tar.zst nixlib-46516d87227b1aa53d9cdb78943eedc0b1544546.zip | |
Merge pull request #44934 from srhb/warn-on-firefox-vlc
firefoxWrapper: Fail if deprecated enableVLC option exists
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 |
1 files changed, 3 insertions, 0 deletions
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) |