Author: eelco
Date: Thu Oct 6 13:52:54 2011
New Revision: 29701
URL: https://nixos.org/websvn/nix/?rev=29701&sc=1
Log:
* Set the Chrome icon in its desktop item.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/wrapper.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/wrapper.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/wrapper.nix
Thu Oct 6 13:28:03 2011 (r29700)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/wrapper.nix
Thu Oct 6 13:52:54 2011 (r29701)
@@ -1,7 +1,5 @@
{ stdenv, browser, makeDesktopItem, makeWrapper, plugins
-, browserName ? "firefox"
-, desktopName ? "Firefox"
-, nameSuffix ? ""
+, browserName, desktopName, nameSuffix, icon
}:
stdenv.mkDerivation {
@@ -10,7 +8,7 @@
desktopItem = makeDesktopItem {
name = browserName;
exec = browserName;
- icon = "${browser}/lib/${browser.name}/icons/mozicon128.png";
+ icon = icon;
comment = "";
desktopName = desktopName;
genericName = "Web Browser";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Oct 6 13:28:03
2011 (r29700)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Oct 6 13:52:54
2011 (r29701)
@@ -6303,7 +6303,10 @@
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 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
