From aaa9a95e0215eca74a8363bbd5d096dc6adabfdb Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 30 Oct 2022 15:24:34 +0900 Subject: thunderbird, thunderbird-bin: fix desktop item Generate appropriate desktop item for Thunderbird. Fixes #194851. --- .../networking/browsers/firefox/wrapper.nix | 80 ++++++++++++++-------- 1 file changed, 53 insertions(+), 27 deletions(-) (limited to 'pkgs/applications/networking') diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index eeb72590df23e..c52c7caef8687 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -166,38 +166,64 @@ let in stdenv.mkDerivation { inherit pname version; - desktopItem = makeDesktopItem { + desktopItem = makeDesktopItem ({ name = applicationName; exec = "${launcherName} %U"; inherit icon; desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; - genericName = "Web Browser"; - categories = [ "Network" "WebBrowser" ]; - mimeTypes = [ - "text/html" - "text/xml" - "application/xhtml+xml" - "application/vnd.mozilla.xul+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - "x-scheme-handler/ftp" - ]; + startupNotify = true; startupWMClass = wmClass; - actions = { - new-window = { - name = "New Window"; - exec = "${launcherName} --new-window %U"; - }; - new-private-window = { - name = "New Private Window"; - exec = "${launcherName} --private-window %U"; - }; - profile-manager-window = { - name = "Profile Manager"; - exec = "${launcherName} --ProfileManger"; - }; - }; - }; + terminal = false; + } // (if libName == "thunderbird" + then { + genericName = "Email Client"; + comment = "Read and write e-mails or RSS feeds, or manage tasks on calendars."; + categories = [ + "Network" "Chat" "Email" "Feed" "GTK" "News" + ]; + keywords = [ + "mail" "email" "e-mail" "messages" "rss" "calendar" + "address book" "addressbook" "chat" + ]; + mimeTypes = [ + "message/rfc822" + "x-scheme-handler/mailto" + "text/calendar" + "text/x-vcard" + ]; + actions = { + profile-manager-window = { + name = "Profile Manager"; + exec = "${launcherName} --ProfileManger"; + }; + }; + } + else { + genericName = "Web Browser"; + categories = [ "Network" "WebBrowser" ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; + actions = { + new-window = { + name = "New Window"; + exec = "${launcherName} --new-window %U"; + }; + new-private-window = { + name = "New Private Window"; + exec = "${launcherName} --private-window %U"; + }; + profile-manager-window = { + name = "Profile Manager"; + exec = "${launcherName} --ProfileManger"; + }; + }; + })); nativeBuildInputs = [ makeWrapper lndir jq ]; buildInputs = [ browser.gtk3 ]; -- cgit 1.4.1