diff options
Diffstat (limited to 'pkgs/applications/networking/browsers/ladybird/default.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/ladybird/default.nix | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 3be88d290040c..db00c8754791e 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -22,11 +22,11 @@ let inherit (builtins) elemAt; - cldr_version = "44.1.0"; + cldr_version = "45.0.0"; cldr-json = fetchzip { url = "https://github.com/unicode-org/cldr-json/releases/download/${cldr_version}/cldr-${cldr_version}-json-modern.zip"; stripRoot = false; - hash = "sha256-EbbzaaspKgRT/dsJV3Kf0Dfj8LN9zT+Pl4gk5kiOXWk="; + hash = "sha256-BPDvYjlvJMudX/YlS7HrwKEABYx+1KzjiFlLYA5+Oew="; postFetch = '' echo -n ${cldr_version} > $out/version.txt ''; @@ -50,30 +50,40 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-03-16"; + version = "0-unstable-2024-05-26"; src = fetchFromGitHub { owner = "SerenityOS"; repo = "serenity"; - rev = "3a8bde9ef24dace600484b38992fdc7d17bf92c3"; - hash = "sha256-r8HYcexrOjDYsXuCtROiNY7Rl60pVQBvVQf190gqNuY="; + rev = "1a9d8e8fbe360f2d3b376ca0e13c507bd2cc6e8b"; + hash = "sha256-+g/1F/v8nTVbvtSrtyvQbeYacjTlfRpg+Htu0lRlkcU="; }; - sourceRoot = "${finalAttrs.src.name}/Ladybird"; + patches = [ + ./nixos-font-path.patch + ]; postPatch = '' sed -i '/iconutil/d' CMakeLists.txt # Don't set absolute paths in RPATH - substituteInPlace ../Meta/CMake/lagom_install_options.cmake \ + substituteInPlace Meta/CMake/lagom_install_options.cmake \ --replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}" "lib" ''; preConfigure = '' + cd Ladybird + # Setup caches for LibLocale, LibUnicode, LibTimezone, LibTLS and LibGfx # Note that the versions of the input data packages must match the # 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 'set(CACERT_VERSION "${cacert_version}")' ../Meta/CMake/ca_certificates_data.cmake || (echo cacert_version mismatch && exit 1) + mkdir -p build/Caches ln -s ${cldr-json} build/Caches/CLDR |