ladybird: 0-unstable-2024-07-11 -> 0-unstable-2024-08-12

pkgs/applications/networking/browsers/ladybird/default.nix

@@ -13,12 +13,16 @@
 , pkg-config
 , libaom
 , libavif
+, libjxl
+, libtiff
+, libwebp
 , libxcrypt
 , libyuv
 , python3
 , qt6Packages
 , woff2
 , ffmpeg
+, simdutf
 , skia
 , nixosTests
 , AppKit
@@ -57,13 +61,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2024-07-11";
+  version = "0-unstable-2024-08-12";
 
   src = fetchFromGitHub {
     owner = "LadybirdWebBrowser";
     repo = "ladybird";
-    rev = "da8633b2d0ab3b9d8f1cdad39a8ad85ca2accf03";
-    hash = "sha256-NJSuhJWxeGPOVotK+s/mG2bfq19su08wBoxFDs/H9JU=";
+    rev = "7e57cc7b090455e93261c847064f12a61d686ff3";
+    hash = "sha256-8rkgxEfRH8ERuC7iplQKOzKb1EJ4+SNGDX5gTGpOmQo=";
   };
 
   postPatch = ''
@@ -73,6 +77,18 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace Meta/CMake/lagom_install_options.cmake \
       --replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}" "lib"
+
+    # libwebp is not built with cmake support yet
+    # https://github.com/NixOS/nixpkgs/issues/334148
+    cat > Meta/CMake/FindWebP.cmake <<'EOF'
+    find_package(PkgConfig)
+    pkg_check_modules(WEBP libwebp REQUIRED)
+    include_directories(''${WEBP_INCLUDE_DIRS})
+    link_directories(''${WEBP_LIBRARY_DIRS})
+    EOF
+    substituteInPlace Userland/Libraries/LibGfx/CMakeLists.txt \
+      --replace-fail 'WebP::' "" \
+      --replace-fail libwebpmux webpmux
   '';
 
   preConfigure = ''
@@ -125,10 +141,13 @@ stdenv.mkDerivation (finalAttrs: {
     ffmpeg
     libaom
     libavif
+    libjxl
+    libwebp
     libxcrypt
     libyuv
     qtbase
     qtmultimedia
+    simdutf
     skia
     woff2
   ] ++ lib.optional stdenv.isLinux [