public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Set the Chrome icon in its desktop item.

Browse Source 
svn path=/nixpkgs/trunk/; revision=29701
This commit is contained in:
Eelco Dolstra 2011-10-06 13:52:54 +00:00
parent 57f482e2c3
commit ee74cf87dc
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -1,7 +1,5 @@
{ stdenv, browser, makeDesktopItem, makeWrapper, plugins { stdenv, browser, makeDesktopItem, makeWrapper, plugins
, browserName ? "firefox" , browserName, desktopName, nameSuffix, icon
, desktopName ? "Firefox"
, nameSuffix ? ""
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -10,7 +8,7 @@ stdenv.mkDerivation {
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = browserName; name = browserName;
exec = browserName; exec = browserName;
icon = "${browser}/lib/${browser.name}/icons/mozicon128.png"; icon = icon;
comment = ""; comment = "";
desktopName = desktopName; desktopName = desktopName;
genericName = "Web Browser"; genericName = "Web Browser";

10
pkgs/top-level/all-packages.nix
View File

@ -6303,7 +6303,10 @@ let
patchelf = patchelf06; 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 { cinelerra = callPackage ../applications/video/cinelerra {
inherit (gnome) esound; inherit (gnome) esound;
@ -7446,9 +7449,10 @@ let
wordnet = callPackage ../applications/misc/wordnet { }; wordnet = callPackage ../applications/misc/wordnet { };
wrapFirefox = 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 { 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 = plugins =
let let
enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true; enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;