gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zim-tools: 3.5.0 -> 3.6.0

Browse Source 
Diff: https://github.com/openzim/zim-tools/compare/refs/tags/3.5.0...refs/tags/3.6.0
This commit is contained in:
emaryn
2025-06-04 14:54:17 +08:00
parent 4a948ca091
commit d64db7c1fb
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/zi/zim-tools/fix_build_with_icu76.patch
+6 -7
View File
@@ -2,17 +2,16 @@ diff --git a/meson.build b/meson.build
index 344bbaf..ddad570 100644
--- a/meson.build
+++ b/meson.build
@@ -17,8 +17,11 @@ if static_linkage
@@ -17,7 +17,11 @@
endif
endif
-libzim_dep = dependency('libzim', version:'>=9.2.0', static:static_linkage)
-libzim_dep = dependency('libzim', version:'<10.0.0', static:static_linkage)
-libzim_dep = dependency('libzim', version:['>=9.2.0', '<10.0.0'], static:static_linkage)
+libzim_dep = [
+ dependency('libzim', version:['>=9.2.0', '<10.0.0'], static:static_linkage),
+ dependency('icu-i18n', static:static_linkage),
+ dependency('icu-uc', static:static_linkage)
+]
with_xapian_support = compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
with_xapian_support = compiler.has_header_symbol(
'zim/zim.h', 'LIBZIM_WITH_XAPIAN', dependencies: libzim_dep)
pkgs/by-name/zi/zim-tools/package.nix
+5 -5
View File
@@ -15,15 +15,15 @@
gtest,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "zim-tools";
version = "3.5.0";
version = "3.6.0";
src = fetchFromGitHub {
owner = "openzim";
repo = "zim-tools";
tag = version;
hash = "sha256-gcCo3u1pLm1CnTF3CATOri5+zat839zUbmQnMOVjanI=";
tag = finalAttrs.version;
hash = "sha256-8+/3+FOq35FSYzpQdpqs5MTMtUO5SYbKLPECFi+IIKw=";
};
patches = [
@@ -59,4 +59,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.all;
};
}
})