From e6f2687a838dd6079b65fc2cd67760c590b4bc91 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@users.noreply.github.com>
Date: Tue, 9 Feb 2021 05:37:24 +0100
Subject: [PATCH] firefox: drop enableAdobeFlash option (#1791)

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).
---
 modules/programs/firefox.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

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