From 5f27dd5e5ab9f0b33cd02e462d0042ebe1ef40bd Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 12 Aug 2024 16:30:32 +0200 Subject: [PATCH] skia: fix missing SkFontMgr_New_FontConfig --- .../sk/skia/export-SkFontMgr_New_FontConfig.patch | 12 ++++++++++++ pkgs/by-name/sk/skia/package.nix | 7 +++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch diff --git a/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch b/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch new file mode 100644 index 000000000000..1609e7347fde --- /dev/null +++ b/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch @@ -0,0 +1,12 @@ +diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp +index 7d6fd62..2cca01d 100644 +--- a/src/ports/SkFontMgr_fontconfig.cpp ++++ b/src/ports/SkFontMgr_fontconfig.cpp +@@ -16,6 +16,7 @@ + #include "include/core/SkString.h" + #include "include/core/SkTypeface.h" + #include "include/core/SkTypes.h" ++#include "include/ports/SkFontMgr_fontconfig.h" + #include "include/private/base/SkDebug.h" + #include "include/private/base/SkMutex.h" + #include "include/private/base/SkTArray.h" diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix index d6fb1940efbe..af417a06ad09 100644 --- a/pkgs/by-name/sk/skia/package.nix +++ b/pkgs/by-name/sk/skia/package.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY="; }; + patches = [ + # Package ladybird uses SkFontMgr_New_FontConfig, but this version of skia + # does not export it. + # https://skia.googlesource.com/skia/+/4bf56844d4a661d7317882cc545ecd978715a11e%5E!/? + ./export-SkFontMgr_New_FontConfig.patch + ]; + postPatch = '' # System zlib detection bug workaround substituteInPlace BUILD.gn \