diff options
| author | Samuel Gräfenstein <git@samuelgrf.com> | 2020-08-21 20:39:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 20:39:05 +0200 |
| commit | 9b06980c61028fb81d2b579539d17b3fb3c261fd (patch) | |
| tree | 30495f148d276e63173c56340649d29c2d16c12b /pkgs/applications/networking/browsers | |
| parent | b6e2e4c777490f52603bc21415ee9a95d8d3c6c4 (diff) | |
google-chrome-{beta,dev}: fix icons (#95389)
The icon naming scheme for Chrome Beta/Dev has changed from
`product_logo_{res}.png` to `product_logo_{res}_{branch}.png`.Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/google-chrome/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 8d711b6de2fab..fa19c4efa9d8f 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -119,9 +119,13 @@ in stdenv.mkDerivation { --replace /opt $out/share \ --replace $out/share/google/$appname/google-$appname $exe - for icon_file in $out/share/google/chrome*/product_logo_*[0-9].png; do + for icon_file in $out/share/google/chrome*/product_logo_[0-9]*.png; do num_and_suffix="''${icon_file##*logo_}" - icon_size="''${num_and_suffix%.*}" + if [ $dist = "stable" ]; then + icon_size="''${num_and_suffix%.*}" + else + icon_size="''${num_and_suffix%_*}" + fi logo_output_prefix="$out/share/icons/hicolor" logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" mkdir -p "$logo_output_path" |