eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-01 00:39:45 +01:00
Code Issues Releases Wiki Activity

firefox: drop enableAdobeFlash option (#1791)

Browse source 
It was removed in nixpkgs and causes an error on rebuilds.

error: Your configuration mentions firefox.enableAdobeFlash. 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).
This commit is contained in:
Martin Weinelt 2021-02-09 05:37:24 +01:00 committed by GitHub
parent b220d5c446
commit e6f2687a83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/programs/firefox.nix
View file

@ -67,6 +67,8 @@ in
meta.maintainers = [ maintainers.rycee ]; meta.maintainers = [ maintainers.rycee ];
imports = [ imports = [
(mkRemovedOptionModule ["programs" "firefox" "enableAdobeFlash"]
"Support for this option has been removed.")
(mkRemovedOptionModule ["programs" "firefox" "enableGoogleTalk"] (mkRemovedOptionModule ["programs" "firefox" "enableGoogleTalk"]
"Support for this option has been removed.") "Support for this option has been removed.")
(mkRemovedOptionModule ["programs" "firefox" "enableIcedTea"] (mkRemovedOptionModule ["programs" "firefox" "enableIcedTea"]
@ -215,12 +217,6 @@ in
description = "Attribute set of Firefox profiles."; description = "Attribute set of Firefox profiles.";
}; };
enableAdobeFlash = mkOption {
type = types.bool;
default = false;
description = "Whether to enable the unfree Adobe Flash plugin.";
};
enableGnomeExtensions = mkOption { enableGnomeExtensions = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -272,7 +268,6 @@ in
let let
# The configuration expected by the Firefox wrapper. # The configuration expected by the Firefox wrapper.
fcfg = { fcfg = {
enableAdobeFlash = cfg.enableAdobeFlash;
enableGnomeExtensions = cfg.enableGnomeExtensions; enableGnomeExtensions = cfg.enableGnomeExtensions;
}; };