diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 24e1e827363..0784b79d8bd 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,7 +1,5 @@ { stdenv, browser, makeDesktopItem, makeWrapper, plugins -, browserName ? "firefox" -, desktopName ? "Firefox" -, nameSuffix ? "" +, browserName, desktopName, nameSuffix, icon }: stdenv.mkDerivation { @@ -10,7 +8,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName; - icon = "${browser}/lib/${browser.name}/icons/mozicon128.png"; + icon = icon; comment = ""; desktopName = desktopName; genericName = "Web Browser"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5c4d812c8c..c754d07480d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6303,7 +6303,10 @@ let patchelf = patchelf06; }; - chromeWrapper = wrapFirefox { browser = chrome; browserName = "chrome"; desktopName = "Chrome"; }; + chromeWrapper = wrapFirefox + { browser = chrome; browserName = "chrome"; desktopName = "Chrome"; + icon = "${chrome}/libexec/chrome/product_logo_48.png"; + }; cinelerra = callPackage ../applications/video/cinelerra { inherit (gnome) esound; @@ -7446,9 +7449,10 @@ let wordnet = callPackage ../applications/misc/wordnet { }; wrapFirefox = - { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" }: + { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" + , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }: import ../applications/networking/browsers/firefox/wrapper.nix { - inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix; + inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; plugins = let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;