diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index f4d45508568..4b1efef027e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -62,16 +62,12 @@ , waylandSupport ? true , libxkbcommon, calendarSupport ? true -# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at -# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we -# have permission to use the official branding. -# -# For purposes of documentation the statement of @sylvestre: -# > As the person who did part of the work described in the LWN article -# > and release manager working for Mozilla, I can confirm the statement -# > that I made in -# > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006 -, enableOfficialBranding ? true +, # If you want the resulting program to call itself "Thunderbird" instead +# of "Earlybird" or whatever, enable this option. However, those +# binaries may not be distributed without permission from the +# Mozilla Foundation, see +# http://www.mozilla.org/foundation/trademarks/. +enableOfficialBranding ? false }: assert waylandSupport -> gtk3Support == true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 749e24faff6..961806fa9ab 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -60,16 +60,12 @@ , waylandSupport ? true , libxkbcommon, calendarSupport ? true -# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at -# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we -# have permission to use the official branding. -# -# For purposes of documentation the statement of @sylvestre: -# > As the person who did part of the work described in the LWN article -# > and release manager working for Mozilla, I can confirm the statement -# > that I made in -# > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006 -, enableOfficialBranding ? true +, # If you want the resulting program to call itself "Thunderbird" instead +# of "Earlybird" or whatever, enable this option. However, those +# binaries may not be distributed without permission from the +# Mozilla Foundation, see +# http://www.mozilla.org/foundation/trademarks/. +enableOfficialBranding ? false }: assert waylandSupport -> gtk3Support == true;