about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2013-05-26 20:44:31 +0200
committeraszlig <aszlig@redmoonstudios.org>2013-05-27 10:17:59 +0200
commitbdeee9bcc4b34de7d6592738d86bc1cfd79bd8a9 (patch)
tree4978099d227d88b42ffd202671804e732b85cf0e /pkgs/applications
parentd7380bcdc721ff50a44d03107c314e08a8c7e545 (diff)
downloadnixlib-bdeee9bcc4b34de7d6592738d86bc1cfd79bd8a9.tar
nixlib-bdeee9bcc4b34de7d6592738d86bc1cfd79bd8a9.tar.gz
nixlib-bdeee9bcc4b34de7d6592738d86bc1cfd79bd8a9.tar.bz2
nixlib-bdeee9bcc4b34de7d6592738d86bc1cfd79bd8a9.tar.lz
nixlib-bdeee9bcc4b34de7d6592738d86bc1cfd79bd8a9.tar.xz
nixlib-bdeee9bcc4b34de7d6592738d86bc1cfd79bd8a9.tar.zst
nixlib-bdeee9bcc4b34de7d6592738d86bc1cfd79bd8a9.zip
chromium: Fix installing logo images.
Actually a "*[0-9]" wildcard isn't enough for some unrelated icons to slip into
the derivation output, so let's explicitely check again within the for loop.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 5be67c888d9c..33140c481f47 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -206,6 +206,7 @@ in stdenv.mkDerivation rec {
     for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do
       num_and_suffix="''${icon_file##*logo_}"
       icon_size="''${num_and_suffix%.*}"
+      expr "$icon_size" : "^[0-9][0-9]*$" || continue
       logo_output_prefix="$out/share/icons/hicolor"
       logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
       mkdir -vp "$logo_output_path"