From 7de1f10607e30625c88824dd94ee384f914607eb Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 26 Dec 2025 15:23:26 +0100 Subject: [PATCH 1/2] skia: 129-unstable-2024-09-18 -> 144-unstable-2025-12-02 --- pkgs/by-name/sk/skia/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix index 09c3c3851a62..d1395ac59e5e 100644 --- a/pkgs/by-name/sk/skia/package.nix +++ b/pkgs/by-name/sk/skia/package.nix @@ -30,19 +30,21 @@ stdenv.mkDerivation (finalAttrs: { # Version from https://skia.googlesource.com/skia/+/refs/heads/main/RELEASE_NOTES.md # or https://chromiumdash.appspot.com/releases # plus date of the tip of the corresponding chrome/m$version branch - version = "129-unstable-2024-09-18"; + version = "144-unstable-2025-12-02"; src = fetchgit { url = "https://skia.googlesource.com/skia.git"; # Tip of the chrome/m$version branch - rev = "dda581d538cb6532cda841444e7b4ceacde01ec9"; - hash = "sha256-NZiZFsABebugszpYsBusVlTYnYda+xDIpT05cZ8Jals="; + rev = "ee20d565acb08dece4a32e3f209cdd41119015ca"; + hash = "sha256-0LiFK/8873gei70iVhNGRlcFeGIp7tjDEfxTBz1LYv8="; }; postPatch = '' + substituteInPlace BUILD.gn \ + --replace-fail 'rebase_path("//bin/gn")' '"gn"' # System zlib detection bug workaround substituteInPlace BUILD.gn \ - --replace-fail 'deps = [ "//third_party/zlib" ]' 'deps = []' + --replace-fail '"//third_party/zlib",' "" ''; strictDeps = true; From eabf39bb96b25f1b0e9c7e785163ae4b4e3b2324 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 26 Dec 2025 15:29:07 +0100 Subject: [PATCH 2/2] ladybird: 0-unstable-2025-12-03 -> 0-unstable-2025-12-24 --- pkgs/by-name/la/ladybird/package.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 3bbb4abb2fe8..382894ea6d2b 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, unicode-emoji, unicode-character-database, unicode-idna, @@ -29,17 +30,18 @@ unstableGitUpdater, libtommath, sdl3, + icu78, }: stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2025-12-03"; + version = "0-unstable-2025-12-24"; src = fetchFromGitHub { owner = "LadybirdBrowser"; repo = "ladybird"; - rev = "9b4d9966da96b7f6421b59eb0adfe90d484ee920"; - hash = "sha256-dqTxW1ENc3k9pk8z2BFPsVJVren9ZkFovKKhNAcs1eo="; + rev = "5b4341996b2d22e549f0bc6f749b188e5014847f"; + hash = "sha256-EVP8OoFqOySAhy02nQpc4CKYCV/rPW87pjMxb/IdBxM="; }; postPatch = '' @@ -100,8 +102,17 @@ stdenv.mkDerivation (finalAttrs: { # Remove when/if this gets upstreamed in skia. "extra_cflags+=[\"-DSKCMS_API=[[gnu::visibility(\\\"default\\\")]]\"]" ]; + # Ladybird depends on the vcpkg-packaged version of skia, + # which includes this patch that exposes deprecated interfaces. + patches = prev.patches or [ ] ++ [ + (fetchpatch { + url = "https://github.com/microsoft/vcpkg/raw/64e1fbee7d9f40eab5d112aaff648c4dcffe9e47/ports/skia/skpath-enable-edit-methods.patch"; + hash = "sha256-r5+HqSjACINn8igXqBANQsq0K+fn+Ut8L2VRs40FkTM="; + }) + ]; })) woff2 + icu78 ] ++ lib.optional stdenv.hostPlatform.isLinux [ libpulseaudio.dev @@ -114,6 +125,9 @@ stdenv.mkDerivation (finalAttrs: { # Disable network operations "-DLADYBIRD_CACHE_DIR=Caches" "-DENABLE_NETWORK_DOWNLOADS=OFF" + # Ladybird requires icu 78, but without this flag the default icu + # from other dependencies gets picked up instead. + (lib.cmakeFeature "ICU_ROOT" (toString icu78.dev)) ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DCMAKE_INSTALL_LIBEXECDIR=libexec"