From 0e8e90254e90b74e4f274afeb7ef5e0ce01cede8 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 27 Feb 2025 21:52:56 +0100
Subject: [PATCH 1/3] ladybird: format with nixfmt

---
 .../networking/browsers/ladybird/default.nix  | 141 ++++++++++--------
 1 file changed, 76 insertions(+), 65 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix
index d21eda1c1f42..cc0f11400463 100644
--- a/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/pkgs/applications/networking/browsers/ladybird/default.nix
@@ -1,32 +1,32 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchzip
-, fetchurl
-, cacert
-, unicode-emoji
-, unicode-character-database
-, cmake
-, ninja
-, pkg-config
-, curl
-, libavif
-, libGL
-, libjxl
-, libpulseaudio
-, libwebp
-, libxcrypt
-, openssl
-, python3
-, qt6Packages
-, woff2
-, ffmpeg
-, fontconfig
-, simdutf
-, skia
-, nixosTests
-, unstableGitUpdater
-, apple-sdk_14
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  cacert,
+  unicode-emoji,
+  unicode-character-database,
+  cmake,
+  ninja,
+  pkg-config,
+  curl,
+  libavif,
+  libGL,
+  libjxl,
+  libpulseaudio,
+  libwebp,
+  libxcrypt,
+  openssl,
+  python3,
+  qt6Packages,
+  woff2,
+  ffmpeg,
+  fontconfig,
+  simdutf,
+  skia,
+  nixosTests,
+  unstableGitUpdater,
+  apple-sdk_14,
 }:
 
 let
@@ -104,42 +104,48 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs = with qt6Packages; [
-    curl
-    ffmpeg
-    fontconfig
-    libavif
-    libGL
-    libjxl
-    libwebp
-    libxcrypt
-    openssl
-    qtbase
-    qtmultimedia
-    simdutf
-    (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
-    qtwayland
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_14
-  ];
+  buildInputs =
+    with qt6Packages;
+    [
+      curl
+      ffmpeg
+      fontconfig
+      libavif
+      libGL
+      libjxl
+      libwebp
+      libxcrypt
+      openssl
+      qtbase
+      qtmultimedia
+      simdutf
+      (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
+      qtwayland
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_14
+    ];
 
-  cmakeFlags = [
-    # Disable network operations
-    "-DSERENITY_CACHE_DIR=Caches"
-    "-DENABLE_NETWORK_DOWNLOADS=OFF"
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    "-DCMAKE_INSTALL_LIBEXECDIR=libexec"
-  ];
+  cmakeFlags =
+    [
+      # Disable network operations
+      "-DSERENITY_CACHE_DIR=Caches"
+      "-DENABLE_NETWORK_DOWNLOADS=OFF"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      "-DCMAKE_INSTALL_LIBEXECDIR=libexec"
+    ];
 
   # FIXME: Add an option to -DENABLE_QT=ON on macOS to use Qt rather than Cocoa for the GUI
 
@@ -168,7 +174,12 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://ladybird.org";
     license = licenses.bsd2;
     maintainers = with maintainers; [ fgaz ];
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
     mainProgram = "Ladybird";
   };
 })

From 421b5dd9f4d86d4831a1842a68b99e9d16f68d86 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 27 Feb 2025 21:53:39 +0100
Subject: [PATCH 2/3] ladybird: move to pkgs/by-name

---
 .../ladybird/default.nix => by-name/la/ladybird/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/browsers/ladybird/default.nix => by-name/la/ladybird/package.nix} (100%)

diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/by-name/la/ladybird/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/ladybird/default.nix
rename to pkgs/by-name/la/ladybird/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ca49b385d42..367e7e3f89e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14045,8 +14045,6 @@ with pkgs;
 
   ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
 
-  ladybird = callPackage ../applications/networking/browsers/ladybird { };
-
   lemonbar = callPackage ../applications/window-managers/lemonbar { };
 
   lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };

From c3df4c92ef459dea4e20a0d64acfd8578c351a71 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 27 Feb 2025 21:55:11 +0100
Subject: [PATCH 3/3] ladybird: don't use `with qt6Packages;`

---
 pkgs/by-name/la/ladybird/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index cc0f11400463..68449c4518b4 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -96,16 +96,15 @@ stdenv.mkDerivation (finalAttrs: {
     chmod +w build/Caches/AdobeICCProfiles
   '';
 
-  nativeBuildInputs = with qt6Packages; [
+  nativeBuildInputs = [
     cmake
     ninja
     pkg-config
     python3
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs =
-    with qt6Packages;
     [
       curl
       ffmpeg
@@ -116,8 +115,8 @@ stdenv.mkDerivation (finalAttrs: {
       libwebp
       libxcrypt
       openssl
-      qtbase
-      qtmultimedia
+      qt6Packages.qtbase
+      qt6Packages.qtmultimedia
       simdutf
       (skia.overrideAttrs (prev: {
         gnFlags = prev.gnFlags ++ [
@@ -131,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional stdenv.hostPlatform.isLinux [
       libpulseaudio.dev
-      qtwayland
+      qt6Packages.qtwayland
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       apple-sdk_14