From c8e727c78339db22941ae53c306dbefd2fc5335b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Aug 2020 20:21:08 +0200 Subject: [PATCH] Revert "Merge #94880: thunderbird: enable branding by default" This reverts commit 4bf857a0f2a0c63b924356c949c0def7c6bf7ae2, reversing changes made to 00c48082521d6fbf236abf5c80cd3d2abac9d0df. See the PR for discussion; apparently an explicit permission is missing. --- .../networking/mailreaders/thunderbird/68.nix | 16 ++++++---------- .../mailreaders/thunderbird/default.nix | 16 ++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) 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;