From d8f8f317269d74e7e201051e77e16f7533d1e4b6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 27 Apr 2014 16:39:11 +0200 Subject: chromium: Fix desktop icon and duplicate entry. This should fix the desktop icon location for both desktop entries (the one from the Chromium derivation itself and the wrapper) and renames the name of the file so that it gets overridden by the wrappers desktop item so we don't end up having two of them. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 9e906191afe4..44fd3c69e537 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -39,9 +39,9 @@ let }; desktopItem = makeDesktopItem { - name = "Chromium"; + name = "chromium"; exec = "chromium"; - icon = "chromium"; + icon = "${chromium.browser}/share/icons/hicolor/48x48/apps/chromium.png"; comment = "An open source web browser from Google"; desktopName = "Chromium"; genericName = "Web browser"; @@ -74,6 +74,7 @@ in stdenv.mkDerivation { --set CHROMIUM_SANDBOX_BINARY_PATH "${sandboxBinary}" \ --add-flags "${chromium.plugins.flagsEnabled}" + ln -s "${chromium.browser}/share/icons" "$out/share/icons" cp -v "${desktopItem}/share/applications/"* "$out/share/applications" ''; -- cgit 1.4.1