diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-07-22 17:36:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 17:36:05 +0200 |
| commit | f81f71591399b64ffe0c7002042078bd0a7b2192 (patch) | |
| tree | 18c2dd8d6461e9875ca02991754ad6f118b58c83 | |
| parent | d89015db440ad85d18b3dcd593e40552020cb8ef (diff) | |
| parent | 3285cc390e9aff7c828a156424b34ba86885b014 (diff) | |
| download | nixpkgs-f81f71591399b64ffe0c7002042078bd0a7b2192.tar nixpkgs-f81f71591399b64ffe0c7002042078bd0a7b2192.tar.gz nixpkgs-f81f71591399b64ffe0c7002042078bd0a7b2192.tar.bz2 nixpkgs-f81f71591399b64ffe0c7002042078bd0a7b2192.tar.lz nixpkgs-f81f71591399b64ffe0c7002042078bd0a7b2192.tar.xz nixpkgs-f81f71591399b64ffe0c7002042078bd0a7b2192.tar.zst nixpkgs-f81f71591399b64ffe0c7002042078bd0a7b2192.zip | |
Merge pull request #131100 from primeos/chromium
chromium: Fix the text rendering (some text was invisible)
| -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 { |