0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

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

This commit is contained in:
Jon Seager 2024-10-03 21:52:55 +01:00 committed by GitHub
commit bb11a6ca30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -44,6 +44,7 @@
nss, nss,
pango, pango,
pipewire, pipewire,
vulkan-loader,
wayland, # ozone/wayland wayland, # ozone/wayland
# Command line programs # Command line programs
@ -152,6 +153,7 @@ let
speechd-minimal speechd-minimal
systemd systemd
util-linux util-linux
vulkan-loader
wayland wayland
wget wget
] ]
@ -164,11 +166,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: { linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru; inherit pname meta passthru;
version = "129.0.6668.58"; version = "129.0.6668.89";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; 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 # With strictDeps on, some shebangs were not being patched correctly
@ -209,9 +211,12 @@ let
exe=$out/bin/google-chrome-$dist exe=$out/bin/google-chrome-$dist
mkdir -p $out/bin $out/share mkdir -p $out/bin $out/share
cp -v -a opt/* $out/share
cp -v -a usr/share/* $out/share
cp -a opt/* $out/share # replace bundled vulkan-loader
cp -a usr/share/* $out/share 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 \ substituteInPlace $out/share/google/$appname/google-$appname \
--replace-fail 'CHROME_WRAPPER' 'WRAPPER' --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 "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
--add-flags ${lib.escapeShellArg commandLineArgs} --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 for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do
patchelf --set-rpath $rpath $elf patchelf --set-rpath $rpath $elf
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
@ -258,11 +266,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: { darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru; inherit pname meta passthru;
version = "129.0.6668.59"; version = "129.0.6668.90";
src = fetchurl { src = fetchurl {
url = "http://dl.google.com/release2/chrome/acinjqjzbtmzhvrebvzymzvzfaoq_129.0.6668.59/GoogleChrome-129.0.6668.59.dmg"; url = "http://dl.google.com/release2/chrome/n4gcpoygckhm4y53qwq7lkpnqu_129.0.6668.90/GoogleChrome-129.0.6668.90.dmg";
hash = "sha256-02J3TpcAsCvsB71C8/bfgIxiqcGIxjKiTWR32On66+g="; hash = "sha256-viQSX8ogY5ywPqgVmMToHdZysxLuC8U78UJ9fIUrGCs=";
}; };
dontPatch = true; dontPatch = true;