diff options
| author | ajs124 <git@ajs124.de> | 2022-02-16 21:17:30 +0100 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2022-02-16 21:17:30 +0100 |
| commit | 19be17d54f52b4fa0424f6e88867e57a09c94da2 (patch) | |
| tree | e5a0482bd6478ebe6e750aea1fce0e23382535d5 /pkgs/applications/networking/browsers/firefox/wrapper.nix | |
| parent | 5d7a9733a7f44f352285a78382bc9a0253231f1e (diff) | |
| download | nixpkgs-19be17d54f52b4fa0424f6e88867e57a09c94da2.tar nixpkgs-19be17d54f52b4fa0424f6e88867e57a09c94da2.tar.gz nixpkgs-19be17d54f52b4fa0424f6e88867e57a09c94da2.tar.bz2 nixpkgs-19be17d54f52b4fa0424f6e88867e57a09c94da2.tar.lz nixpkgs-19be17d54f52b4fa0424f6e88867e57a09c94da2.tar.xz nixpkgs-19be17d54f52b4fa0424f6e88867e57a09c94da2.tar.zst nixpkgs-19be17d54f52b4fa0424f6e88867e57a09c94da2.zip | |
wrapFirefox: remove old npapi plugin related options
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/wrapper.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 5e88de35655..9a4c3edfef3 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -152,24 +152,7 @@ let # # ############################# - # TODO: remove this after the next release (21.03) - configPlugins = lib.filter (a: builtins.hasAttr a cfg) [ - "enableAdobeFlash" - "enableAdobeReader" - "enableBluejeans" - "enableDjvu" - "enableFriBIDPlugin" - "enableGoogleTalkPlugin" - "enableMPlayer" - "enableVLC" - "icedtea" - "jre" - ]; - pluginsError = - "Your configuration mentions ${lib.concatMapStringsSep ", " (p: applicationName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; - - in if configPlugins != [] then throw pluginsError else - (stdenv.mkDerivation { + in stdenv.mkDerivation { inherit pname version; desktopItem = makeDesktopItem { @@ -369,5 +352,5 @@ let hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; - }); + }; in lib.makeOverridable wrapper |