From de0dae5666590862c106b14a307b908d67ee41da Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 27 Apr 2019 10:01:30 +0200
Subject: [PATCH] firefox: deprecate Google Talk and IcedTea options

(cherry picked from commit a16439e38efec5a47a3d920f0b06b57de2548e9e)
---
 modules/programs/firefox.nix | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index 1a8454916..e1594a946 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -49,13 +49,33 @@ in
       enableGoogleTalk = mkOption {
         type = types.bool;
         default = false;
-        description = "Whether to enable the unfree Google Talk plugin.";
+        description = ''
+          Whether to enable the unfree Google Talk plugin. This option
+          is <emphasis>deprecated</emphasis> and will only work if
+
+          <programlisting language="nix">
+          programs.firefox.package = pkgs.firefox-esr-52-unwrapped;
+          </programlisting>
+
+          and the <option>plugin.load_flash_only</option> Firefox
+          option has been disabled.
+        '';
       };
 
       enableIcedTea = mkOption {
         type = types.bool;
         default = false;
-        description = "Whether to enable the Java applet plugin.";
+        description = ''
+          Whether to enable the Java applet plugin. This option is
+          <emphasis>deprecated</emphasis> and will only work if
+
+          <programlisting language="nix">
+          programs.firefox.package = pkgs.firefox-esr-52-unwrapped;
+          </programlisting>
+
+          and the <option>plugin.load_flash_only</option> Firefox
+          option has been disabled.
+        '';
       };
     };
   };