Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ladybird: 0-unstable-2024-06-08 -> 0-unstable-2024-07-11 #326493

Merged
merged 1 commit into from
Jul 12, 2024
Merged

ladybird: 0-unstable-2024-06-08 -> 0-unstable-2024-07-11 #326493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions pkgs/applications/networking/browsers/ladybird/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@
, cmake
, ninja
, pkg-config
, libavif
, libxcrypt
, python3
, qt6Packages
, woff2
, ffmpeg
, skia
, nixosTests
, AppKit
, Cocoa
Expand Down Expand Up @@ -52,13 +55,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
version = "0-unstable-2024-06-08";
version = "0-unstable-2024-07-11";

src = fetchFromGitHub {
owner = "LadybirdWebBrowser";
repo = "ladybird";
rev = "2f68e361370040d8cdc75a8ed8af4239134ae481";
hash = "sha256-EQZTsui4lGThSi+8a6KSyL5lJnO0A8fJ8HWY4jgkpUA=";
rev = "da8633b2d0ab3b9d8f1cdad39a8ad85ca2accf03";
hash = "sha256-NJSuhJWxeGPOVotK+s/mG2bfq19su08wBoxFDs/H9JU=";
};

postPatch = ''
Expand All @@ -76,8 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
# expected version in the package's CMake.

# Check that the versions match
grep -F 'set(CLDR_VERSION "${cldr_version}")' Meta/CMake/locale_data.cmake || (echo cldr_version mismatch && exit 1)
grep -F 'set(TZDB_VERSION "${tzdata.version}")' Meta/CMake/time_zone_data.cmake || (echo tzdata.version mismatch && exit 1)
grep -F 'locale_version = "${cldr_version}"' Meta/gn/secondary/Userland/Libraries/LibLocale/BUILD.gn || (echo cldr_version mismatch && exit 1)
grep -F 'tzdb_version = "${tzdata.version}"' Meta/gn/secondary/Userland/Libraries/LibTimeZone/BUILD.gn || (echo tzdata.version mismatch && exit 1)
grep -F 'set(CACERT_VERSION "${cacert_version}")' Meta/CMake/ca_certificates_data.cmake || (echo cacert_version mismatch && exit 1)

mkdir -p build/Caches
Expand Down Expand Up @@ -116,9 +119,12 @@ stdenv.mkDerivation (finalAttrs: {
];

buildInputs = with qt6Packages; [
ffmpeg
libavif
libxcrypt
qtbase
qtmultimedia
skia
woff2
] ++ lib.optional stdenv.isLinux [
qtwayland
Expand All @@ -133,11 +139,8 @@ stdenv.mkDerivation (finalAttrs: {
# Disable network operations
"-DSERENITY_CACHE_DIR=Caches"
"-DENABLE_NETWORK_DOWNLOADS=OFF"
"-DENABLE_COMMONMARK_SPEC_DOWNLOAD=OFF"
] ++ lib.optionals stdenv.isLinux [
"-DCMAKE_INSTALL_LIBEXECDIR=libexec"
# FIXME: Enable this when launching with the commandline flag --enable-gpu-painting doesn't fail calling eglBindAPI on GNU/Linux
"-DENABLE_ACCELERATED_GRAPHICS=OFF"
];

# FIXME: Add an option to -DENABLE_QT=ON on macOS to use Qt rather than Cocoa for the GUI
Expand Down