MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

firefoxWrapper: install icon to hicolor theme

Browse source
This commit is contained in:
Thomas Tuegel 2015-05-17 17:13:34 -05:00
parent 9474fefe28
commit 6803ddbf60
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
desktopItem = makeDesktopItem {
name = browserName;
exec = browserName + " %U";
icon = browserName;
inherit icon;
comment = "";
desktopName = desktopName;
genericName = "Web Browser";
@ -58,8 +58,14 @@ stdenv.mkDerivation {
''
}
mkdir -p $out/share/icons
ln -s $out/lib/${browserName}${nameSuffix}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png
if [ -e "${browser}/share/icons" ]; then
mkdir -p "$out/share"
ln "${browser}/share/icons" "$out/share/icons"
else
mkdir -p "$out/share/icons/hicolor/128x128/apps"
ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \
"$out/share/icons/hicolor/128x128/apps/${browserName}.png"
fi
mkdir -p $out/share/applications
cp $desktopItem/share/applications/* $out/share/applications

6
pkgs/top-level/all-packages.nix
View file

@ -11563,9 +11563,7 @@ let
};
midoriWrapper = wrapFirefox
{ browser = midori; browserName = "midori"; desktopName = "Midori";
icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png";
};
{ browser = midori; browserName = "midori"; desktopName = "Midori"; };
mikmod = callPackage ../applications/audio/mikmod { };
@ -12629,7 +12627,7 @@ let
wrapFirefox =
{ browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
, icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }:
, icon ? browserName }:
let
cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or false;