alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #160365 from helsinki-systems/clean/wrapFirefox

Browse source 
wrapFirefox: remove old npapi plugin related options
This commit is contained in:
Bernardo Meurer 2022-02-16 20:22:38 -08:00 committed by GitHub
parent aa278c508d 19be17d54f
commit 886ce02fc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -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