git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #139315 from primeos/ungoogled-chromium

ungoogled-chromium: 93.0.4577.82 -> 94.0.4606.54

commit3a6cdbeb5774ed4bd0bf20bce8c84fd7709066be authorMichael Weiss <dev.primeos@gmail.com> dateSat 25 Sep 2021, 00:11 (5 years ago) parent3987f9cafaf8d0
4 files changed+10−55
pkgs/applications/networking/browsers/chromium/browser.nix+1−2 pkgs/applications/networking/browsers/chromium/common.nix+1−19 pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch−26 pkgs/applications/networking/browsers/chromium/upstream-info.json+8−8
pkgs/applications/networking/browsers/chromium/browser.nix+1−2
@@ -19,8 +19,7 @@ mkChromiumDerivation (base: rec {
1919 cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
2020 cp -v "$buildPath/icudtl.dat" "$libExecPath/"
2121 cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
22− ${lib.optionalString (!chromiumVersionAtLeast "94") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''}
23− ${lib.optionalString (chromiumVersionAtLeast "94") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''}
22+ cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"
2423 cp -v "$buildPath/chrome" "$libExecPath/$packageName"
2524
2625 # Swiftshader
pkgs/applications/networking/browsers/chromium/common.nix+1−19
@@ -160,21 +160,6 @@ let
160160 ./patches/no-build-timestamps.patch
161161 # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags:
162162 ./patches/widevine-79.patch
163− ] ++ lib.optionals (versionRange "91" "94") [
164− # Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
165− ./patches/fix-missing-atspi2-dependency.patch
166− # Required as dependency for the next patch:
167− (githubPatch {
168− # Reland "Reland "Linux sandbox syscall broker: use struct kernel_stat""
169− commit = "4b438323d68840453b5ef826c3997568e2e0e8c7";
170− sha256 = "1lf6yilx2ffd3r0840ilihp4px35w7jvr19ll56bncqmz4r5fd82";
171− })
172− # To fix the text rendering, see #131074:
173− (githubPatch {
174− # Linux sandbox: fix fstatat() crash
175− commit = "60d5e803ef2a4874d29799b638754152285e0ed9";
176− sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70";
177− })
178163 ];
179164
180165 postPatch = ''
@@ -253,6 +238,7 @@ let
253238 # e.g. unsafe developer builds have developer-friendly features that may
254239 # weaken or disable security measures like sandboxing or ASLR):
255240 is_official_build = true;
241+ disable_fieldtrial_testing_config = true;
256242 # Build Chromium using the system toolchain (for Linux distributions):
257243 custom_toolchain = "//build/toolchain/linux/unbundle:default";
258244 host_toolchain = "//build/toolchain/linux/unbundle:default";
@@ -289,10 +275,6 @@ let
289275 enable_widevine = true;
290276 # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture:
291277 rtc_use_pipewire = true;
292− } // optionalAttrs (!chromiumVersionAtLeast "94") {
293− fieldtrial_testing_like_official_build = true;
294− } // optionalAttrs (chromiumVersionAtLeast "94") {
295− disable_fieldtrial_testing_config = true;
296278 } // optionalAttrs proprietaryCodecs {
297279 # enable support for the H.264 codec
298280 proprietary_codecs = true;
pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patchdeleted−26
@@ -1,26 +0,0 @@
1−From 6c5b9197076f6f384112e6566039116c56600909 Mon Sep 17 00:00:00 2001
2−From: Michael Weiss <dev.primeos@gmail.com>
3−Date: Sat, 10 Apr 2021 13:53:50 +0200
4−Subject: [PATCH] Fix a missing atspi2 dependency
5−
6−See https://bugs.chromium.org/p/chromium/issues/detail?id=1197837 for
7−more details.
8−---
9− content/public/browser/BUILD.gn | 1 +
10− 1 file changed, 1 insertion(+)
11−
12−diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
13−index 7e7c436d90c7..20ef832f1d8c 100644
14−--- a/content/public/browser/BUILD.gn
15−+++ b/content/public/browser/BUILD.gn
16−@@ -535,6 +535,7 @@ source_set("browser_sources") {
17−
18− if (use_atk) {
19− sources += [ "ax_inspect_factory_auralinux.cc" ]
20−+ configs += [ "//build/config/linux/atspi2" ]
21− }
22−
23− if (is_linux || is_chromeos) {
24−--
25−2.20.1
26−
pkgs/applications/networking/browsers/chromium/upstream-info.json+8−8
@@ -44,19 +44,19 @@
4444 }
4545 },
4646 "ungoogled-chromium": {
47− "version": "93.0.4577.82",
48− "sha256": "0lr8zdq06smncdzd6knzww9hxl8ynvxadmrkyyl13fpwb1422rjx",
49− "sha256bin64": "0ydvcakpnl20gx7493hv6aqnyf8f28rkvzgwnm4gws92b92n9ify",
47+ "version": "94.0.4606.54",
48+ "sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83",
49+ "sha256bin64": "0lq34l00zrr92g882xzqwq1lf2vf12x1mwidrr2qh6fz7v5418d3",
5050 "deps": {
5151 "gn": {
52− "version": "2021-07-08",
52+ "version": "2021-08-11",
5353 "url": "https://gn.googlesource.com/gn",
54− "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
55− "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
54+ "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263",
55+ "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
5656 },
5757 "ungoogled-patches": {
58− "rev": "93.0.4577.82-1",
59− "sha256": "199f78f5gvnkpkcvh7587pk35jslkszhvv1d648b4qphzxmw7c66"
58+ "rev": "94.0.4606.54-1",
59+ "sha256": "0phy87fiqdgikgl60yap7n1mvyvsidgznqp06j86287iihml3z2m"
6060 }
6161 }
6262 }