summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/chromium/common.nix
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2021-07-22 16:54:35 +0200
committerMichael Weiss <dev.primeos@gmail.com>2021-07-22 17:22:06 +0200
commit3285cc390e9aff7c828a156424b34ba86885b014 (patch)
tree082e046281edb542b019396a4cc6757a6c6fd176 /pkgs/applications/networking/browsers/chromium/common.nix
parent202f0e817fdff097306babb32adc57029ea5b3cc (diff)
downloadnixpkgs-3285cc390e9aff7c828a156424b34ba86885b014.tar
nixpkgs-3285cc390e9aff7c828a156424b34ba86885b014.tar.gz
nixpkgs-3285cc390e9aff7c828a156424b34ba86885b014.tar.bz2
nixpkgs-3285cc390e9aff7c828a156424b34ba86885b014.tar.lz
nixpkgs-3285cc390e9aff7c828a156424b34ba86885b014.tar.xz
nixpkgs-3285cc390e9aff7c828a156424b34ba86885b014.tar.zst
nixpkgs-3285cc390e9aff7c828a156424b34ba86885b014.zip
chromium: Fix the text rendering (some text was invisible)
The recent glibc update (acdcb85) broke the text rendering, see #131074.
This will hopefully work for ungoogled-chromium as well (at least the
patch applies).

Thanks: Lily Foster <lily@lily.flowers>
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix13
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 {