diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:26:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:26:00 +0000 |
| commit | ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d (patch) | |
| tree | 504b28a058661f6c1cbb7d3f580020e50367ca7f /nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | 55cc63c079f49e81d695a25bc2f5b3902f2bd290 (diff) | |
| parent | b09661d41fb93562fd53f31574dbf781b130ac44 (diff) | |
| download | nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.gz nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.bz2 nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.lz nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.xz nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.zst nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.zip | |
Merge commit 'b09661d41fb93562fd53f31574dbf781b130ac44'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 18565f31a2fb..6daafc204eb8 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/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 { |