diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ad28d829157b..6403f5441f36 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -162,6 +162,7 @@ let ] ++ optional enableWideVine ./patches/widevine.patch ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [ ./patches/skia_buildfix.patch + ./patches/neon_buildfix.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch new file mode 100644 index 000000000000..b44487ca634c --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch @@ -0,0 +1,21 @@ +diff --git a/skia/ext/convolver_neon.cc b/skia/ext/convolver_neon.cc +index 26b91b9..cae6bc2 100644 +--- a/skia/ext/convolver_neon.cc ++++ b/skia/ext/convolver_neon.cc + +@@ -23,7 +23,7 @@ + remainder[2] += coeff * pixels_left[i * 4 + 2]; + remainder[3] += coeff * pixels_left[i * 4 + 3]; + } +- return {remainder[0], remainder[1], remainder[2], remainder[3]}; ++ return vld1q_s32(remainder); + } + + // Convolves horizontally along a single row. The row data is given in +@@ -336,4 +336,4 @@ + } + } + +-} // namespace skia +\ No newline at end of file ++} // namespace skia