From f5fa05677d941c8d27d0852de9b43f7e2148ae04 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sat, 15 Apr 2017 21:11:34 +0200 Subject: [PATCH] thunderbird: (re)add features lost in refactoring The refactoring in b023370f3757a76acb244e647f29e388e076cab0 ported changes from firefox-unwrpped, but dropped features in firefox's wrapper. Add the desktop item and remove useless dev files. --- .../mailreaders/thunderbird/default.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 69286202823b..54d7723026a5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -15,6 +15,7 @@ # Mozilla Foundation, see # http://www.mozilla.org/foundation/trademarks/. enableOfficialBranding ? false +, makeDesktopItem }: stdenv.mkDerivation rec { @@ -107,6 +108,32 @@ stdenv.mkDerivation rec { # Needed to find Mozilla runtime gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped") + + # TODO: Move to a dev output? + rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl + + ${ let desktopItem = makeDesktopItem { + name = "thunderbird"; + exec = "$out/bin/thunderbird %U"; + desktopName = "Thunderbird"; + icon = "$out/lib/thunderbird-${version}/chrome/icons/default/default256.png"; + genericName = "Main Reader"; + categories = "Application;Network"; + mimeType = stdenv.lib.concatStringsSep ";" [ + # Email + "x-scheme-handler/mailto" + "message/rfc822" + # Newsgroup + "x-scheme-handler/news" + "x-scheme-handler/snews" + "x-scheme-handler/nntp" + # Feed + "x-scheme-handler/feed" + "application/rss+xml" + "application/x-extension-rss" + ]; + }; in desktopItem.buildCommand + } ''; postFixup =