Unverified Commit aff07219 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

libzim: Add upstream icu76 compat patch, kiwix: 2.3.1-unstable-2024-02-20 ->...

libzim: Add upstream icu76 compat patch, kiwix: 2.3.1-unstable-2024-02-20 -> 2.4.1, libkiwix: 13.1.0 -> 14.0.0 (#385849)
parents 45cebbe8 04d9a298
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
  lib,
  mkDerivation,
  fetchFromGitHub,
  nix-update-script,
  libkiwix,
  pkg-config,
  qmake,
@@ -12,15 +13,15 @@
  aria2,
}:

mkDerivation {
mkDerivation rec {
  pname = "kiwix";
  version = "2.3.1-unstable-2024-02-20";
  version = "2.4.1";

  src = fetchFromGitHub {
    owner = "kiwix";
    repo = "kiwix-desktop";
    rev = "17ac566b07814aefb1decf108e4ba6d7ad9ef7bc";
    hash = "sha256-BZzFnQE8/dyZkpY0X3zZ6yC6yLZ002Q/RoDzEhSOa/g=";
    rev = version;
    hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw=";
  };

  nativeBuildInputs = [
@@ -40,12 +41,14 @@ mkDerivation {
    "--prefix PATH : ${lib.makeBinPath [ aria2 ]}"
  ];

  passthru.updateScript = nix-update-script { };

  meta = with lib; {
    description = "Offline reader for Web content";
    mainProgram = "kiwix-desktop";
    homepage = "https://kiwix.org";
    license = licenses.gpl3Plus;
    platforms = platforms.linux;
    maintainers = [ ];
    maintainers = with maintainers; [ greg ];
  };
}
+8 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
  nix-update-script,
  meson,
  ninja,
  pkg-config,
@@ -18,13 +19,13 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "libkiwix";
  version = "13.1.0";
  version = "14.0.0";

  src = fetchFromGitHub {
    owner = "kiwix";
    repo = "libkiwix";
    rev = finalAttrs.version;
    hash = "sha256-DKOwzfGyad/3diOaV1K8hXqT8YGfqCP6QDKDkxWu/1U=";
    hash = "sha256-QP23ZS0FJsMVtnWOofywaAPIU0GJ2L+hLP/x0LXMKiU=";
  };

  nativeBuildInputs = [
@@ -55,8 +56,13 @@ stdenv.mkDerivation (finalAttrs: {

  postPatch = ''
    patchShebangs scripts
    substituteInPlace meson.build \
        --replace-fail "libicu_dep = dependency('icu-i18n', static:static_deps)" \
                       "libicu_dep = [dependency('icu-i18n', static:static_deps), dependency('icu-uc', static:static_deps)]"
  '';

  passthru.updateScript = nix-update-script { };

  meta = with lib; {
    description = "Common code base for all Kiwix ports";
    homepage = "https://kiwix.org";
+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
  fetchpatch,
  icu,
  meson,
  ninja,
@@ -23,6 +24,15 @@ stdenv.mkDerivation rec {
    hash = "sha256-z22+cDlFQtLMLFh5+7Nt9LsGFyBPi3HeZhYb0LK86Oc=";
  };

  patches = [
    # Upstream patch for ICU76 compatibility.
    # https://github.com/openzim/libzim/pull/936
    (fetchpatch {
      url = "https://github.com/openzim/libzim/commit/4a42b3c6971c9534b104f48f6d13db8630a97d2f.patch";
      hash = "sha256-FjaGZ2bI1ROLg3rvWIGLbVoImGr51MbWjbBj+lGj1rs=";
    })
  ];

  nativeBuildInputs = [
    ninja
    meson