diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index d2a8f276f120..c4ad73679b7e 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -81,7 +81,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { # Add optional CLI options: options = [] major_version = "${versions.major (getVersion chromiumPkg.name)}" - if major_version > "91": + if major_version > "91" and pname.startswith("google-chrome"): # To avoid a GPU crash: options += ["--use-gl=angle", "--use-angle=swiftshader"] options.append("file://${startupHTML}") diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 602e2e6a8299..de96753a6756 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -62,9 +62,9 @@ mkChromiumDerivation (base: rec { -e '/\[Desktop Entry\]/a\' \ -e 'StartupWMClass=chromium-browser' \ $out/share/applications/chromium-browser.desktop - '' + lib.optionalString (channel != "stable") '' + '' + '' cp -v "$buildPath/crashpad_handler" "$libExecPath/" - ''; + ''; # TODO: Merge passthru = { inherit sandboxExecutableName; }; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 535b87a87fd0..c83a0e166bd4 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -165,7 +165,7 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - libPath = lib.makeLibraryPath [ libva pipewire ]; + libPath = lib.makeLibraryPath [ libva pipewire gtk3 ]; in with lib; '' mkdir -p "$out/bin" diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 71887b8b85f2..1064356be542 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,20 +1,20 @@ { "stable": { - "version": "91.0.4472.164", - "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4", - "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr", + "version": "92.0.4515.107", + "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf", + "sha256bin64": "0vfg8wjf9i1yz8nlxsij8fmqq7qr4nsccaihppqm3axpk91mmdsj", "deps": { "gn": { - "version": "2021-04-06", + "version": "2021-05-07", "url": "https://gn.googlesource.com/gn", - "rev": "dba01723a441c358d843a575cb7720d54ddcdf92", - "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" + "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", + "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" } }, "chromedriver": { - "version": "91.0.4472.101", - "sha256_linux": "0dzx565z2rd0y4i57rv5kd7dsm69sffza96y3c773hqaghm4y1ng", - "sha256_darwin": "0nff1jmmrn6a4clfvhyzrhfp8hx85z72563jwk28apflqmnm0k68" + "version": "92.0.4515.43", + "sha256_linux": "1s22y892py99kzcb2j3gafmbz9jrr2lfhhh8hp3ggn2i37yxs8bw", + "sha256_darwin": "1cjg4r4z5m74c2si4m25rj3z44n0iimhqzb1l3l3y0a3q024bi8f" } }, "beta": {