diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-22 18:01:39 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-22 18:01:39 +0000 |
commit | 0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac (patch) | |
tree | 6475a18d8f5d3fd9ea110fd7db803c8ad312842c /pkgs/applications/networking/browsers | |
parent | 741be6dfc1fdd013ee52c4154dd82cd69d328be3 (diff) | |
parent | 4df8d6305c414a172f167f900e852724dedbca3a (diff) | |
download | nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar.gz nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar.bz2 nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar.lz nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar.xz nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar.zst nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 18565f31a2f..6daafc204eb 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -167,6 +167,19 @@ let # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch + ] ++ lib.optionals (versionRange "91" "94.0.4583.0") [ + # 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"; + }) ] ++ lib.optionals (chromiumVersionAtLeast "93") [ # We need to revert this patch to build M93 with LLVM 12. (githubPatch { |