diff options
author | Francesco Gazzetta <fgaz@fgaz.me> | 2024-06-06 20:58:30 +0200 |
---|---|---|
committer | Francesco Gazzetta <fgaz@fgaz.me> | 2024-07-02 12:29:48 +0000 |
commit | c978dac641e40b8f6c66be69b22a2753d8141eb0 (patch) | |
tree | 0dddc6baf653e6f316f01324810e04feb6dc3142 /pkgs/applications | |
parent | 0ef1870535d48aace577c99436a21636ad092c2a (diff) |
ladybird: 0-unstable-2024-06-04 -> 0-unstable-2024-06-08
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/browsers/ladybird/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch | 12 |
2 files changed, 7 insertions, 19 deletions
diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 85d85ba2476b1..aaa2e9e21ba80 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,9 +10,11 @@ , darwin , cmake , ninja +, pkg-config , libxcrypt , python3 , qt6Packages +, woff2 , nixosTests , AppKit , Cocoa @@ -50,19 +52,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-06-04"; + version = "0-unstable-2024-06-08"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "c6e9f0e7b5b050ddbb5d735ca9c65458add9b4a5"; - hash = "sha256-+NDrd0kO9bqXFcCEJFmNwNu5jmf+wT+uUVlmbmCYLw4="; + rev = "2f68e361370040d8cdc75a8ed8af4239134ae481"; + hash = "sha256-EQZTsui4lGThSi+8a6KSyL5lJnO0A8fJ8HWY4jgkpUA="; }; - patches = [ - ./nixos-font-path.patch - ]; - postPatch = '' sed -i '/iconutil/d' Ladybird/CMakeLists.txt @@ -112,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = with qt6Packages; [ cmake ninja + pkg-config python3 wrapQtAppsHook ]; @@ -120,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: { libxcrypt qtbase qtmultimedia + woff2 ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa diff --git a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch b/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch deleted file mode 100644 index 468eb10b2c313..0000000000000 --- a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Userland/Libraries/LibCore/StandardPaths.cpp b/Userland/Libraries/LibCore/StandardPaths.cpp -index 77ddbeb9..76481497 100644 ---- a/Userland/Libraries/LibCore/StandardPaths.cpp -+++ b/Userland/Libraries/LibCore/StandardPaths.cpp -@@ -205,6 +205,7 @@ ErrorOr<Vector<String>> StandardPaths::font_directories() - "/Library/Fonts"_string, - TRY(String::formatted("{}/Library/Fonts"sv, home_directory())), - # else -+ "/run/current-system/sw/share/X11/fonts"_string, - "/usr/share/fonts"_string, - "/usr/local/share/fonts"_string, - TRY(String::formatted("{}/.local/share/fonts"sv, home_directory())), |