From ecbb380498db5ee942de29d9b0ffd1d5fa41d6c5 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 23 Dec 2024 22:34:00 +0100 Subject: [PATCH] ladybird: 0-unstable-2024-11-21 -> 0-unstable-2024-12-23 --- .../networking/browsers/ladybird/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 1d80cfc82b67f..6d82bd7883529 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -15,6 +15,7 @@ , libpulseaudio , libwebp , libxcrypt +, openssl , python3 , qt6Packages , woff2 @@ -49,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-11-21"; + version = "0-unstable-2024-12-23"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "6dc61f895db424e1ab245a7d4d219c6054a31ce3"; - hash = "sha256-lEE2cfnQMSBi7+d34dbiuE5lwiGOzW1384/ohC+cf7I="; + rev = "d5bbf8dcf803c429afab76610dfba3b1ee23f0ae"; + hash = "sha256-Kew/MFFCq6sTXt8jfXC78kpQNHAjX8cQyLWO3+MeikU="; }; postPatch = '' @@ -111,10 +112,18 @@ stdenv.mkDerivation (finalAttrs: { libjxl libwebp libxcrypt + openssl qtbase qtmultimedia simdutf - skia + (skia.overrideAttrs (prev: { + gnFlags = prev.gnFlags ++ [ + # https://github.com/LadybirdBrowser/ladybird/commit/af3d46dc06829dad65309306be5ea6fbc6a587ec + # https://github.com/LadybirdBrowser/ladybird/commit/4d7b7178f9d50fff97101ea18277ebc9b60e2c7c + # Remove when/if this gets upstreamed in skia. + "extra_cflags+=[\"-DSKCMS_API=__attribute__((visibility(\\\"default\\\")))\"]" + ]; + })) woff2 ] ++ lib.optional stdenv.hostPlatform.isLinux [ libpulseaudio.dev