diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index be22339417bd..c77e70f01aa1 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,6 +10,7 @@ , cmake , ninja , pkg-config +, curl , libavif , libjxl , libwebp @@ -57,13 +58,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-09-08"; + version = "0-unstable-2024-09-21"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "8d6f36f8d6c0aea0253df8c84746f8c99bf79b4d"; - hash = "sha256-EB26SAh9eckpq/HrO8O+PivMMmLpFtCdCNkOJcLQvZw="; + rev = "44f672bacf6779f6bbe5972d84e210f953f14598"; + hash = "sha256-Qku6W1kETOXQh8Kxn0wabe0Xc4gkpxrGbDFwIik34eY="; }; postPatch = '' @@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = with qt6Packages; [ + curl ffmpeg libavif libjxl diff --git a/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch b/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch deleted file mode 100644 index 1609e7347fde..000000000000 --- a/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 6c70e99bb2fb..a6972b628bd8 100644 --- a/pkgs/by-name/sk/skia/package.nix +++ b/pkgs/by-name/sk/skia/package.nix @@ -26,22 +26,15 @@ 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 = "124-unstable-2024-05-22"; + version = "129-unstable-2024-09-18"; src = fetchgit { url = "https://skia.googlesource.com/skia.git"; # Tip of the chrome/m$version branch - rev = "a747f7ea37db6ea3871816dbaf2eb41b5776c826"; - hash = "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY="; + rev = "dda581d538cb6532cda841444e7b4ceacde01ec9"; + hash = "sha256-NZiZFsABebugszpYsBusVlTYnYda+xDIpT05cZ8Jals="; }; - 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 \