JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge #94880: thunderbird: enable branding by default"

Browse Source 
This reverts commit 4bf857a0f2, reversing
changes made to 00c4808252.
See the PR for discussion; apparently an explicit permission is missing.
This commit is contained in:
Vladimír Čunát 2020-08-18 20:21:08 +02:00
parent 726bf83ffa
commit c8e727c783
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/networking/mailreaders/thunderbird/68.nix
View File

@ -62,16 +62,12 @@
, waylandSupport ? true , waylandSupport ? true
, libxkbcommon, calendarSupport ? true , libxkbcommon, calendarSupport ? true
# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at , # If you want the resulting program to call itself "Thunderbird" instead
# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we # of "Earlybird" or whatever, enable this option. However, those
# have permission to use the official branding. # binaries may not be distributed without permission from the
# # Mozilla Foundation, see
# For purposes of documentation the statement of @sylvestre: # http://www.mozilla.org/foundation/trademarks/.
# > As the person who did part of the work described in the LWN article enableOfficialBranding ? false
# > 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
}: }:
assert waylandSupport -> gtk3Support == true; assert waylandSupport -> gtk3Support == true;

16
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -60,16 +60,12 @@
, waylandSupport ? true , waylandSupport ? true
, libxkbcommon, calendarSupport ? true , libxkbcommon, calendarSupport ? true
# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at , # If you want the resulting program to call itself "Thunderbird" instead
# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we # of "Earlybird" or whatever, enable this option. However, those
# have permission to use the official branding. # binaries may not be distributed without permission from the
# # Mozilla Foundation, see
# For purposes of documentation the statement of @sylvestre: # http://www.mozilla.org/foundation/trademarks/.
# > As the person who did part of the work described in the LWN article enableOfficialBranding ? false
# > 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
}: }:
assert waylandSupport -> gtk3Support == true; assert waylandSupport -> gtk3Support == true;