From dfc3536d74845d65e5a903adc1f8ee0e58d0c1de Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sun, 28 Dec 2025 19:51:32 +1100
Subject: [PATCH] aseprite, skia-aseprite: fix build with GCC 15

---
 pkgs/by-name/as/aseprite/package.nix      |  5 +++++
 pkgs/by-name/sk/skia-aseprite/package.nix | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix
index 5897f83913cb..87b8b27b3b11 100644
--- a/pkgs/by-name/as/aseprite/package.nix
+++ b/pkgs/by-name/as/aseprite/package.nix
@@ -105,6 +105,11 @@ clangStdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace src/ver/CMakeLists.txt \
       --replace-fail '"1.x-dev"' '"${finalAttrs.version}"'
+
+    # Using substituteInPlace because no upstream patch for GCC 15 was found for this bundled library.
+    substituteInPlace third_party/json11/json11.cpp \
+      --replace-fail "#include <cmath>" "#include <cmath>
+    #include <cstdint>"
   '';
 
   cmakeFlags = [
diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix
index 446556a126b8..c2de5cece603 100644
--- a/pkgs/by-name/sk/skia-aseprite/package.nix
+++ b/pkgs/by-name/sk/skia-aseprite/package.nix
@@ -41,6 +41,16 @@ clangStdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
+  # Using substituteInPlace because no clean upstream backport for GCC 15 exists for this version of Skia, newer versions fix this with large refactorings.
+  postPatch = ''
+    substituteInPlace include/private/SkSLProgramKind.h \
+      --replace-fail "#include <cinttypes>" "#include <cinttypes>
+    #include <cstdint>"
+    substituteInPlace src/sksl/transform/SkSLTransform.h \
+      --replace-fail "#include <vector>" "#include <vector>
+    #include <cstdint>"
+  '';
+
   preConfigure = with depSrcs; ''
     mkdir -p third_party/externals
     ln -s ${angle2} third_party/externals/angle2