Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8148771b1a9d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6b5f85a62c44
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 27, 2020

  1. 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`.

(cherry picked from commit 9b06980)
    @samuelgrf @primeos
    samuelgrf authored and primeos committed Oct 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e2b5833 View commit details

  2. google-chrome: add libxkbcommon+wayland for ozone/wayland 

    (cherry picked from commit 9eaddfd)
    @colemickens @primeos
    colemickens authored and primeos committed Oct 27, 2020

    Partially verified

    This commit is signed with the committer’s verified signature.
    primeos’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    6b5f85a View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 pkgs/applications/networking/browsers/google-chrome/default.nix
10 changes: 8 additions & 2 deletions pkgs/applications/networking/browsers/google-chrome/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
, kerberos, libdrm, mesa
, libxkbcommon, wayland # ozone/wayland

# Command line programs
, coreutils
@@ -62,6 +63,7 @@ let
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
bzip2 libcap at-spi2-atk at-spi2-core
kerberos libdrm mesa coreutils
libxkbcommon wayland
] ++ optional pulseSupport libpulseaudio
++ [ gtk ];

@@ -119,9 +121,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"