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

chromium: 85.0.4183.121 -> 86.0.4240.75

commit2603bd54e4f47b3627c62a505a8cf831f4a76613 authorMichael Weiss <dev.primeos@gmail.com> dateFri 9 Oct 2020, 21:54 (6 years ago) parentaf91961757bbdd
6 files changed+20−127
pkgs/applications/networking/browsers/chromium/browser.nix+1−1 pkgs/applications/networking/browsers/chromium/common.nix+8−17 pkgs/applications/networking/browsers/chromium/default.nix+2−13 pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch−26 pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch−61 pkgs/applications/networking/browsers/chromium/upstream-info.json+9−9
pkgs/applications/networking/browsers/chromium/browser.nix+1−1
@@ -13,7 +13,7 @@ mkChromiumDerivation (base: rec {
1313
1414 installPhase = ''
1515 mkdir -p "$libExecPath"
16− cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
16+ cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
1717 cp -v "$buildPath/icudtl.dat" "$libExecPath/"
1818 cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
1919 cp -v "$buildPath/chrome" "$libExecPath/$packageName"
pkgs/applications/networking/browsers/chromium/common.nix+8−17
@@ -13,7 +13,6 @@
1313, bison, gperf
1414, glib, gtk3, dbus-glib
1515, glibc
16−, xorg
1716, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
1817, protobuf, speechd, libXdamage, cups
1918, ffmpeg_3, libxslt, libxml2, at-spi2-core
@@ -131,7 +130,6 @@ let
131130 ninja which python2Packages.python perl pkgconfig
132131 python2Packages.ply python2Packages.jinja2 nodejs
133132 gnutar python2Packages.setuptools
134− (xorg.xcbproto.override { python = python2Packages.python; })
135133 ];
136134
137135 buildInputs = defaultDependencies ++ [
@@ -150,13 +148,10 @@ let
150148 ++ optional pulseSupport libpulseaudio
151149 ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
152150
153− patches = optionals (versionRange "68" "86") [
154− ./patches/nix_plugin_paths_68.patch
155− ] ++ [
151+ patches = [
156152 ./patches/remove-webp-include-69.patch
157153 ./patches/no-build-timestamps.patch
158154 ./patches/widevine-79.patch
159− ./patches/dont-use-ANGLE-by-default.patch
160155 # Unfortunately, chromium regularly breaks on major updates and
161156 # then needs various patches backported in order to be compiled with GCC.
162157 # Good sources for such patches and other hints:
@@ -166,18 +161,19 @@ let
166161 #
167162 # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
168163 # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
169− ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build:
170− ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
171− ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
172− ];
164+ ]; # TODO: VA-API patches (we should be able to drop enable-video-acceleration-on-linux.patch now):
165+ # ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build:
166+ # ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
167+ # ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
168+ # ];
173169
174− postPatch = optionalString (!versionRange "0" "86") ''
170+ postPatch = ''
175171 # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.):
176172 substituteInPlace native_client/SConstruct \
177173 --replace "#! -*- python -*-" ""
178174 substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
179175 --replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
180− '' + ''
176+
181177 # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
182178 substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
183179 --replace \
@@ -195,11 +191,6 @@ let
195191 '/usr/share/locale/' \
196192 '${glibc}/share/locale/'
197193
198− substituteInPlace ui/gfx/x/BUILD.gn \
199− --replace \
200− '/usr/share/xcb' \
201− '${xorg.xcbproto}/share/xcb/'
202−
203194 sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
204195 chrome/browser/shell_integration_linux.cc
205196
pkgs/applications/networking/browsers/chromium/default.nix+2−13
@@ -1,5 +1,5 @@
11{ newScope, config, stdenv, fetchurl, makeWrapper
2−, llvmPackages_10, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils
2+, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils
33, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
44, libva ? null
55, pipewire_0_2
@@ -23,7 +23,7 @@
2323}:
2424
2525let
26− llvmPackages = llvmPackages_10;
26+ llvmPackages = llvmPackages_11;
2727 stdenv = llvmPackages.stdenv;
2828
2929 callPackage = newScope chromium;
@@ -37,16 +37,6 @@ let
3737 inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs
3838 cupsSupport pulseSupport useOzone;
3939 # TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
40− gnChromium = gn.overrideAttrs (oldAttrs: {
41− version = "2020-05-19";
42− src = fetchgit {
43− url = "https://gn.googlesource.com/gn";
44− rev = "d0a6f072070988e7b038496c4e7d6c562b649732";
45− sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17";
46− };
47− });
48− } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") {
49− llvmPackages = llvmPackages_11;
5040 gnChromium = gn.overrideAttrs (oldAttrs: {
5141 version = "2020-07-20";
5242 src = fetchgit {
@@ -56,7 +46,6 @@ let
5646 };
5747 });
5848 } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") {
59− llvmPackages = llvmPackages_11;
6049 useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/
6150 gnChromium = gn.overrideAttrs (oldAttrs: {
6251 version = "2020-08-17";
pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patchdeleted−26
@@ -1,26 +0,0 @@
1−A field trial currently enables the passthrough command decoder, which causes
2−gl_factory.cc to try kGLImplementationEGLANGLE first, which causes Chromium to fail
3−to load libGLESv2.so on NixOS. It somehow does not try kGLImplementationDesktopGL,
4−and so there is no GL support at all.
5−
6−Revert to using the validating command decoder, which prevents gl_factory.cc
7−from touching allowed_impls, allowing it to successfully use kGLImplementationDesktopGL.
8−
9−diff --git a/ui/gl/gl_utils.cc b/ui/gl/gl_utils.cc
10−index 697cbed5fe2d..8419bdb21a2f 100644
11−--- a/ui/gl/gl_utils.cc
12−+++ b/ui/gl/gl_utils.cc
13−@@ -71,9 +71,10 @@ bool UsePassthroughCommandDecoder(const base::CommandLine* command_line) {
14− } else if (switch_value == kCmdDecoderValidatingName) {
15− return false;
16− } else {
17−- // Unrecognized or missing switch, use the default.
18−- return base::FeatureList::IsEnabled(
19−- features::kDefaultPassthroughCommandDecoder);
20−+ // Ignore the field trial that enables it; disable it until
21−+ // gl_factory.cc kGLImplementationEGLANGLE issues are sorted
22−+ // out on NixOS.
23−+ return false;
24− }
25− }
26− }
pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patchdeleted−61
@@ -1,61 +0,0 @@
1−diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
2−index f4e119d..d9775bd 100644
3−--- a/chrome/common/chrome_paths.cc
4−+++ b/chrome/common/chrome_paths.cc
5−@@ -68,21 +68,14 @@ static base::LazyInstance<base::FilePath>
6− g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
7−
8− // Gets the path for internal plugins.
9−-bool GetInternalPluginsDirectory(base::FilePath* result) {
10−-#if defined(OS_MACOSX)
11−- // If called from Chrome, get internal plugins from a subdirectory of the
12−- // framework.
13−- if (base::mac::AmIBundled()) {
14−- *result = chrome::GetFrameworkBundlePath();
15−- DCHECK(!result->empty());
16−- *result = result->Append("Internet Plug-Ins");
17−- return true;
18−- }
19−- // In tests, just look in the module directory (below).
20−-#endif
21−-
22−- // The rest of the world expects plugins in the module directory.
23−- return base::PathService::Get(base::DIR_MODULE, result);
24−+bool GetInternalPluginsDirectory(base::FilePath* result,
25−+ const std::string& ident) {
26−+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
27−+ const char* value = getenv(full_env.c_str());
28−+ if (value == NULL)
29−+ return base::PathService::Get(base::DIR_MODULE, result);
30−+ else
31−+ *result = base::FilePath(value);
32− }
33−
34− // Gets the path for bundled implementations of components. Note that these
35−@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) {
36− create_dir = true;
37− break;
38− case chrome::DIR_INTERNAL_PLUGINS:
39−- if (!GetInternalPluginsDirectory(&cur))
40−+ if (!GetInternalPluginsDirectory(&cur, "ALL"))
41− return false;
42− break;
43− case chrome::DIR_COMPONENTS:
44−@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) {
45− return false;
46− break;
47− case chrome::DIR_PEPPER_FLASH_PLUGIN:
48−- if (!GetInternalPluginsDirectory(&cur))
49−+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
50− return false;
51− cur = cur.Append(kPepperFlashBaseDirectory);
52− break;
53−@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) {
54− cur = cur.DirName();
55− }
56− #else
57−- if (!GetInternalPluginsDirectory(&cur))
58−+ if (!GetInternalPluginsDirectory(&cur, "PNACL"))
59− return false;
60− #endif
61− cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
pkgs/applications/networking/browsers/chromium/upstream-info.json+9−9
@@ -1,17 +1,17 @@
11{
22 "stable": {
3− "version": "85.0.4183.121",
4− "sha256": "0a1xn39kmvyfpal6pgnylpy30z0322p3v7sx6vxi0r2naiz58670",
5− "sha256bin64": "08vqf1v91703aik47344bl409rsl4myar9bsd2lsvzqncncwsaca"
3+ "version": "86.0.4240.75",
4+ "sha256": "1ddw4p9zfdzhi5hrd8x14k4w326znljzprnpfi2f917rlpnl2ynx",
5+ "sha256bin64": "17isxkd80rccqim6izzl08vw4yr52qsk6djp1rmhhijzg9rsvghz"
66 },
77 "beta": {
8− "version": "86.0.4240.42",
9− "sha256": "06cfhiym9xmz2q86v6b6xcicrrp2pmr7karavylzz4fqvwd2v6fa",
10− "sha256bin64": "1z5zmdc2i31iimps7p5z43vv4qi83c8ljb7x68zc1rvf8x62p7xj"
8+ "version": "86.0.4240.75",
9+ "sha256": "1ddw4p9zfdzhi5hrd8x14k4w326znljzprnpfi2f917rlpnl2ynx",
10+ "sha256bin64": "16snxdka5bkbvybx6x0dzgfbfaifv0jcc1dcny6vlqqp2fmb2v39"
1111 },
1212 "dev": {
13− "version": "87.0.4263.3",
14− "sha256": "1ybfrlm4417lpbg5qcwhq5p6nnxrw68wzyy5zvb1sg1ma8s9hhkk",
15− "sha256bin64": "1f7a272kalglmdwmrrzb4iw3crvvpv3mhxca5jh75qpldn4gby6m"
13+ "version": "87.0.4278.0",
14+ "sha256": "1ywmv4iwn2as7vk2n0pslnmr300fl5y809ynxiw5xqcx9j6i8w85",
15+ "sha256bin64": "15dvwvk6l6n7l04085hr48hlvsijypasyk7d8iq3s6cxai3wx4cl"
1616 }
1717}