From cea1f1b770a7c52c44122188a75f3d777602a304 Mon Sep 17 00:00:00 2001 From: Marcin Falkiewicz Date: Fri, 13 Feb 2015 16:12:59 +0100 Subject: [PATCH] remove x-scheme-handler/mailto from .desktop file; change icon to follow xdg scheme --- .../networking/browsers/firefox/wrapper.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 02bb6a55b429..b43f22cafb6a 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName + " %U"; - icon = icon; + icon = "$out/icons/firefox.png"; comment = ""; desktopName = desktopName; genericName = "Web Browser"; @@ -19,13 +19,10 @@ stdenv.mkDerivation { "text/html" "text/xml" "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" "x-scheme-handler/http" "x-scheme-handler/https" "x-scheme-handler/ftp" - "x-scheme-handler/mailto" - "x-scheme-handler/webcal" - "x-scheme-handler/about" - "x-scheme-handler/unknown" ]; }; @@ -61,6 +58,9 @@ stdenv.mkDerivation { '' } + mkdir -p $out/share/icons + ln -s "$out/lib/firefox-35.0.1/browser/icons/mozicon128.png" "$out/share/icons/firefox.png" + mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications