From 93ab2d8822936a8ee14af24b8c36e145e1cf78be Mon Sep 17 00:00:00 2001 From: Jess Date: Sat, 24 May 2025 21:31:01 +1200 Subject: [PATCH] ladybird: 0-unstable-2025-05-18 -> 0-unstable-2025-05-24 --- .../la/ladybird/001-revert-fake-skia-update.patch | 13 +++++++++++++ pkgs/by-name/la/ladybird/package.nix | 15 ++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/la/ladybird/001-revert-fake-skia-update.patch diff --git a/pkgs/by-name/la/ladybird/001-revert-fake-skia-update.patch b/pkgs/by-name/la/ladybird/001-revert-fake-skia-update.patch new file mode 100644 index 000000000000..257fa212fc55 --- /dev/null +++ b/pkgs/by-name/la/ladybird/001-revert-fake-skia-update.patch @@ -0,0 +1,13 @@ +diff --git a/vcpkg.json b/vcpkg.json +index 5a824884b2..e4193aa45f 100644 +--- a/vcpkg.json ++++ b/vcpkg.json +@@ -199,7 +199,7 @@ + }, + { + "name": "skia", +- "version": "134#2" ++ "version": "129#0" + }, + { + "name": "sqlite3", diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 528f69b2e0ec..45cc7bd1b20d 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -29,6 +29,7 @@ nixosTests, unstableGitUpdater, apple-sdk_14, + libtommath, }: let @@ -37,15 +38,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2025-05-18"; + version = "0-unstable-2025-05-24"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "4d039fc3d4bf2ca9bf85c482d0b989c2128567ba"; - hash = "sha256-J29UpFxyKEdHvIOMl3DhvtxIKtEgi6weZsk2UU0py8k="; + rev = "fbd1f771613fc6f13fcc20dcad04c7065633a2c2"; + hash = "sha256-Gtfnq46JrzfpcapMr6Ez+5BNQ59H/Djsgp7n6QvMSUM="; }; + patches = [ + # Revert https://github.com/LadybirdBrowser/ladybird/commit/51d189198d3fc61141fc367dc315c7f50492a57e + # This commit doesn't update the skia used by ladybird vcpkg, but it does update the skia that + # that cmake wants. + ./001-revert-fake-skia-update.patch + ]; + postPatch = '' sed -i '/iconutil/d' UI/CMakeLists.txt @@ -86,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config python3 qt6Packages.wrapQtAppsHook + libtommath ]; buildInputs =