From eb44436e345d79c14d994239fa11207a6169b62a Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 7 Mar 2018 11:33:22 -0500 Subject: [PATCH] thunderbird: enable official branding as was done for firefox in ce08581088897860dd3b7b510f30b093095592f3 --- .../networking/mailreaders/thunderbird/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index bfbd970019732..7b32070c4f9ca 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -9,12 +9,8 @@ , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper , enableCalendar ? true , debugBuild ? false -, # 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 +, # see comment in ../../browsers/firefox/common.nix + enableOfficialBranding ? true , makeDesktopItem }: @@ -177,10 +173,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A full-featured e-mail client"; homepage = http://www.mozilla.org/thunderbird/; - license = - # Official branding implies thunderbird name and logo cannot be reuse, - # see http://www.mozilla.org/foundation/licensing.html - if enableOfficialBranding then licenses.proprietary else licenses.mpl11; + license = licenses.mpl11; maintainers = [ maintainers.pierron maintainers.eelco ]; platforms = platforms.linux; };