diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix b/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix index 0fefc6d41f7c..d12726ec391c 100644 --- a/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "skia-pathops"; - version = "0.7.4"; + version = "0.8.0.post1"; src = fetchPypi { pname = "skia-pathops"; inherit version; extension = "zip"; - hash = "sha256-Ci/e6Ht62wGMv6bpXvnkKZ7WOwCAvidnejD/77ypE1A="; + hash = "sha256-oFYkneL2H6VRFrnuVVE8aja4eK7gDJFFDkBNFgZIXLs="; }; postPatch = '' @@ -36,6 +36,14 @@ buildPythonPackage rec { --replace "-mthumb" "" substituteInPlace src/cpp/skia-builder/skia/src/core/SkOpts.cpp \ --replace "defined(SK_CPU_ARM64)" "0" + '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) /* old compiler? */ '' + patch -p1 <<EOF + --- a/src/cpp/skia-builder/skia/include/private/base/SkTArray.h + +++ b/src/cpp/skia-builder/skia/include/private/base/SkTArray.h + @@ -492 +492 @@: + - static constexpr int kMaxCapacity = SkToInt(std::min(SIZE_MAX / sizeof(T), (size_t)INT_MAX)); + + static constexpr int kMaxCapacity = SkToInt(std::min<size_t>(SIZE_MAX / sizeof(T), (size_t)INT_MAX)); + EOF ''; nativeBuildInputs = [ cython ninja setuptools-scm ] |