Merge pull request #194617 from wegank/skia-pathops-aarch64-darwin

pkgs/development/python-modules/skia-pathops/default.nix

@@ -28,6 +28,13 @@ buildPythonPackage rec {
     substituteInPlace setup.py \
       --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \
         'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]'
+  '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
+    substituteInPlace src/cpp/skia-builder/skia/gn/skia/BUILD.gn \
+      --replace "-march=armv7-a" "-march=armv8-a" \
+      --replace "-mfpu=neon" "" \
+      --replace "-mthumb" ""
+    substituteInPlace src/cpp/skia-builder/skia/src/core/SkOpts.cpp \
+      --replace "defined(SK_CPU_ARM64)" "0"
   '';
 
   nativeBuildInputs = [ cython ninja setuptools-scm ]
@@ -46,6 +53,5 @@ buildPythonPackage rec {
     homepage = "https://skia.org/dev/present/pathops";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.BarinovMaxim ];
-    broken = stdenv.isDarwin && stdenv.isAarch64; # clang-11: error: the clang compiler does not support '-march=armv7-a'
   };
 }