diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-06-30 19:59:49 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-06-30 20:18:24 +0200 |
| commit | 5cae43456679428a675fb7074b48ceb5aa3f73e4 (patch) | |
| tree | cb1e06da0681e1ca69df99d4c32fe704a723ad8d /pkgs/applications/networking/browsers | |
| parent | 5ca13195a2452d70449cbaf6354fa54647a51b2a (diff) | |
chromiumDev: 93.0.4549.3 -> 93.0.4557.4
Would need to temporarily remove "ffmpeg" from gnSystemLibraries and disable use_thin_lto to fix the build (theoretically).
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.json | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e8664690df290..18565f31a2fb3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -175,18 +175,6 @@ let sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c"; revert = true; }) - # To fix build errors with the older system FFmpeg: - (githubPatch { - # unbundle: add libavcodec/packet.h to shim headers - commit = "e4d228ec30607b06bf3fed77497abef89c29966a"; - sha256 = "02jg2bdmgjcpmk6alb72jc93wy3nf2fpa72hb4aarq337i2mwn4v"; - }) - (githubPatch { - # Roll src/third_party/ffmpeg/ 7e1d53a09..cf7ee6598 (1000 commits) - commit = "3ec3b2992238d4b4764f99f04605e154688c7990"; - sha256 = "1fwb154s5qcis490rvcvm14zrmaj59g5lg9zg8ada36vw9hycbrf"; - revert = true; - }) ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index bca947df473b2..9dc9c40df0c13 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "93.0.4549.3", - "sha256": "0bkr67n1d75ayd1d9sa57c99j85r83gadzfs8iw7kwiha9g0mjgp", - "sha256bin64": "1hac6m668nrdzvfqx3vyc74pnx8lf973m1jxnm3cfy83g7wynphz", + "version": "93.0.4557.4", + "sha256": "06397k5mkrrdrmd7icyvd1ifnmhincgw5nskgc3m436qzzifsab9", + "sha256bin64": "1q2c2dhx1yya6vhr82asf7h2zrv6kjzjv1a0zlfxkp3i6lnivgrd", "deps": { "gn": { - "version": "2021-06-18", + "version": "2021-06-25", "url": "https://gn.googlesource.com/gn", - "rev": "170c2dba1e0c0299fe8c6a441caf2f2352a42ae0", - "sha256": "1ylx8a5fxq7aciqs0mx7fld763sqkqn39lb9k951w6gksm15lrn3" + "rev": "4d207c94eab41f09c9a8505eb47f3d2919e47943", + "sha256": "1jfgksa7rifh3ynnmd7m8xxggwxckz0jnwjaq9m5xapksb89hbn1" } } }, |