From 0a8bc59854397f48461bf043c5f61d90e170755d Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 14 Nov 2021 13:54:00 +0900 Subject: [PATCH] wrapFirefox: fix icon linking for Thunderbird Firefox has its icons in `/lib/firefox-bin-*/browser/chrome/icons/default` while Thunderbird has `/lib/thunderbird/chrome/icons/default`. Fixes https://github.com/NixOS/nixpkgs/pull/143942#issuecomment-963418080. (cherry picked from commit 881d3fae720f51142cc0f0f5f9bc533b6e83af23) --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index f338a41be716..ab85fa5648a7 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -285,7 +285,7 @@ let else for res in 16 32 48 64 128; do mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" - icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" ) + icon=$( find "${browser}/lib/" -name "default''${res}.png" ) if [ -e "$icon" ]; then ln -s "$icon" \ "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png" fi