diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 8b80f8f8a6ef..96729f1dcda6 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -19,8 +19,7 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - ${lib.optionalString (!chromiumVersionAtLeast "94") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''} - ${lib.optionalString (chromiumVersionAtLeast "94") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''} + cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" # Swiftshader diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index fac1537a7c7e..767a3f4483ce 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,21 +160,6 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ lib.optionals (versionRange "91" "94") [ - # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): - ./patches/fix-missing-atspi2-dependency.patch - # Required as dependency for the next patch: - (githubPatch { - # Reland "Reland "Linux sandbox syscall broker: use struct kernel_stat"" - commit = "4b438323d68840453b5ef826c3997568e2e0e8c7"; - sha256 = "1lf6yilx2ffd3r0840ilihp4px35w7jvr19ll56bncqmz4r5fd82"; - }) - # To fix the text rendering, see #131074: - (githubPatch { - # Linux sandbox: fix fstatat() crash - commit = "60d5e803ef2a4874d29799b638754152285e0ed9"; - sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70"; - }) ]; postPatch = '' @@ -253,6 +238,7 @@ let # e.g. unsafe developer builds have developer-friendly features that may # weaken or disable security measures like sandboxing or ASLR): is_official_build = true; + disable_fieldtrial_testing_config = true; # Build Chromium using the system toolchain (for Linux distributions): custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; @@ -289,10 +275,6 @@ let enable_widevine = true; # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: rtc_use_pipewire = true; - } // optionalAttrs (!chromiumVersionAtLeast "94") { - fieldtrial_testing_like_official_build = true; - } // optionalAttrs (chromiumVersionAtLeast "94") { - disable_fieldtrial_testing_config = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch deleted file mode 100644 index 9417b30159d7..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6c5b9197076f6f384112e6566039116c56600909 Mon Sep 17 00:00:00 2001 -From: Michael Weiss -Date: Sat, 10 Apr 2021 13:53:50 +0200 -Subject: [PATCH] Fix a missing atspi2 dependency - -See https://bugs.chromium.org/p/chromium/issues/detail?id=1197837 for -more details. ---- - content/public/browser/BUILD.gn | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn -index 7e7c436d90c7..20ef832f1d8c 100644 ---- a/content/public/browser/BUILD.gn -+++ b/content/public/browser/BUILD.gn -@@ -535,6 +535,7 @@ source_set("browser_sources") { - - if (use_atk) { - sources += [ "ax_inspect_factory_auralinux.cc" ] -+ configs += [ "//build/config/linux/atspi2" ] - } - - if (is_linux || is_chromeos) { --- -2.20.1 - diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8280a0239599..0f0cc3437e95 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "93.0.4577.82", - "sha256": "0lr8zdq06smncdzd6knzww9hxl8ynvxadmrkyyl13fpwb1422rjx", - "sha256bin64": "0ydvcakpnl20gx7493hv6aqnyf8f28rkvzgwnm4gws92b92n9ify", + "version": "94.0.4606.54", + "sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83", + "sha256bin64": "0lq34l00zrr92g882xzqwq1lf2vf12x1mwidrr2qh6fz7v5418d3", "deps": { "gn": { - "version": "2021-07-08", + "version": "2021-08-11", "url": "https://gn.googlesource.com/gn", - "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", - "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" + "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", + "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" }, "ungoogled-patches": { - "rev": "93.0.4577.82-1", - "sha256": "199f78f5gvnkpkcvh7587pk35jslkszhvv1d648b4qphzxmw7c66" + "rev": "94.0.4606.54-1", + "sha256": "0phy87fiqdgikgl60yap7n1mvyvsidgznqp06j86287iihml3z2m" } } }