google-chrome: 129.0.6668.58 -> 129.0.6668.89 (#346215)

NixOS · Oct 3, 2024 · bb11a6c · bb11a6c
2 parents 924ee0c + 2b58c0b
commit bb11a6c
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
@@ -44,6 +44,7 @@
  nss,
  pango,
  pipewire,
+ vulkan-loader,
  wayland, # ozone/wayland
 
  # Command line programs
@@ -152,6 +153,7 @@ let
  speechd-minimal
  systemd
  util-linux
+ vulkan-loader
  wayland
  wget
  ]
@@ -164,11 +166,11 @@ let
 
  linux = stdenv.mkDerivation (finalAttrs: {
  inherit pname meta passthru;
- version = "129.0.6668.58";
+ version = "129.0.6668.89";
 
  src = fetchurl {
  url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
- hash = "sha256-lFYGwpdicvp+E4S+sw4+3uFQSwGKvhyFenBZMVgVnMo=";
+ hash = "sha256-7siTsIW29x4XZ+Zut9b5BFSTtc5tuhxusxnkJPouG1w=";
  };
 
  # With strictDeps on, some shebangs were not being patched correctly
@@ -209,9 +211,12 @@ let
  exe=$out/bin/google-chrome-$dist
 
  mkdir -p $out/bin $out/share
+ cp -v -a opt/* $out/share
+ cp -v -a usr/share/* $out/share
 
- cp -a opt/* $out/share
- cp -a usr/share/* $out/share
+ # replace bundled vulkan-loader
+ rm -v $out/share/google/$appname/libvulkan.so.1
+ ln -v -s -t "$out/share/google/$appname" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
 
  substituteInPlace $out/share/google/$appname/google-$appname \
  --replace-fail 'CHROME_WRAPPER' 'WRAPPER'
@@ -247,6 +252,9 @@ let
  --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
  --add-flags ${lib.escapeShellArg commandLineArgs}
 
+ # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so
+ patchelf --set-rpath $rpath $out/share/google/$appname/lib*GL*
+
  for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do
  patchelf --set-rpath $rpath $elf
  patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
@@ -258,11 +266,11 @@ let
 
  darwin = stdenvNoCC.mkDerivation (finalAttrs: {
  inherit pname meta passthru;
- version = "129.0.6668.59";
+ version = "129.0.6668.90";
 
  src = fetchurl {
- url = "http://dl.google.com/release2/chrome/acinjqjzbtmzhvrebvzymzvzfaoq_129.0.6668.59/GoogleChrome-129.0.6668.59.dmg";
- hash = "sha256-02J3TpcAsCvsB71C8/bfgIxiqcGIxjKiTWR32On66+g=";
+ url = "http://dl.google.com/release2/chrome/n4gcpoygckhm4y53qwq7lkpnqu_129.0.6668.90/GoogleChrome-129.0.6668.90.dmg";
+ hash = "sha256-viQSX8ogY5ywPqgVmMToHdZysxLuC8U78UJ9fIUrGCs=";
  };
 
  dontPatch = true;