diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-08-19 19:49:16 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:53:10 +0000 |
| commit | 91873c88ba0129485d453d5f4050cc7188ada04e (patch) | |
| tree | 8b6594869c41ce3f42b54e141fa272b8e3abe5d5 /nixpkgs | |
| parent | 6398e5ddf12f5f4253a758ed8e7fe172ee21a7db (diff) | |
| download | nixlib-91873c88ba0129485d453d5f4050cc7188ada04e.tar nixlib-91873c88ba0129485d453d5f4050cc7188ada04e.tar.gz nixlib-91873c88ba0129485d453d5f4050cc7188ada04e.tar.bz2 nixlib-91873c88ba0129485d453d5f4050cc7188ada04e.tar.lz nixlib-91873c88ba0129485d453d5f4050cc7188ada04e.tar.xz nixlib-91873c88ba0129485d453d5f4050cc7188ada04e.tar.zst nixlib-91873c88ba0129485d453d5f4050cc7188ada04e.zip | |
thunderbird: Enable official branding by default
Now we do have an explicit permission from Mozilla. /cc PR #94880 (cherry picked from commit f77e427cf6ce9c4ef4e1a7d3b18a37b7e432a13c)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix | 9 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 3748b837e378..97aa0f792f3f 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index bf88881d5100..781788304336 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/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; |