diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-08-19 19:49:16 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-08-19 19:49:16 +0200 |
| commit | f77e427cf6ce9c4ef4e1a7d3b18a37b7e432a13c (patch) | |
| tree | 55b9b0b63eab1c16689a80dd994c9f183164f601 /pkgs/applications/networking/mailreaders | |
| parent | c09965182ac18de3215b55c4749b2bb38b721cc4 (diff) | |
thunderbird: Enable official branding by default
Now we do have an explicit permission from Mozilla. /cc PR #94880
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/68.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/default.nix | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 4b1efef027e0f..3143c7f62bb34 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -62,12 +62,9 @@ , waylandSupport ? true , libxkbcommon, calendarSupport ? 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 +# Use official trademarked branding. Permission obtained at: +# https://github.com/NixOS/nixpkgs/pull/94880#issuecomment-675907971 +, enableOfficialBranding ? true }: assert waylandSupport -> gtk3Support == true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 961806fa9abac..53d337067d7fe 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -60,12 +60,9 @@ , waylandSupport ? true , libxkbcommon, calendarSupport ? 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 +# Use official trademarked branding. Permission obtained at: +# https://github.com/NixOS/nixpkgs/pull/94880#issuecomment-675907971 +, enableOfficialBranding ? true }: assert waylandSupport -> gtk3Support == true; |