pyrox.dev
Merge pull request #17815 from juliendehos/zimreader_tntnet221
zimreader: update for using tntnet-2.2.1 ?
authored by Jörg Thalheim and committed by GitHub 2d9148dc b48dafee
+20
-29
pkgs/tools/text/zimreader/default.nix
+20
-29
pkgs/tools/text/zimreader/default.nix
···
1
-
{ stdenv, fetchgit, fetchurl, automake, autoconf, libtool
2
-
, zlib, openssl, zip, zimlib
1
+
{ stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool
2
+
, zlib, openssl, zip, zimlib, cxxtools, tntnet
3
3
}:
4
4
5
-
let
6
-
cxxtools = stdenv.mkDerivation rec {
7
-
name = "cxxtools-${version}";
8
-
version = "2.1.1";
9
-
src = fetchurl {
10
-
url = "http://www.tntnet.org/download/cxxtools-${version}.tar.gz";
11
-
sha256 = "0jh5wrk9mviz4xrp1wv617gwgl4b5mc21h21wr2688kjmc0i1q4d";
12
-
};
13
-
};
14
-
tntnet = stdenv.mkDerivation rec {
15
-
name = "tntnet-${version}";
16
-
version = "2.1";
17
-
src = fetchurl {
18
-
url = "http://www.tntnet.org/download/tntnet-${version}.tar.gz";
19
-
sha256 = "1dhs10yhpmdqyykyh8jc67m5xgsgm1wrpd58fdps2cp5g1gjf8w6";
20
-
};
21
-
buildInputs = [ zlib cxxtools openssl zip ];
5
+
stdenv.mkDerivation rec {
6
+
name = "zimreader-0.92";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "wikimedia";
10
+
repo = "openzim";
11
+
rev = "r1.3"; # there multiple tools with different version in the repo
12
+
sha256 = "0x529137rxy6ld64xqa6xmn93121ripxvkf3sc7hv3wg6km182sw";
22
13
};
23
14
24
-
in stdenv.mkDerivation rec {
25
-
name = "zimreader-${version}";
26
-
version = "20150710";
27
-
28
-
src = fetchgit {
29
-
url = https://gerrit.wikimedia.org/r/p/openzim.git;
30
-
rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456";
31
-
sha256 = "076ixsq4lis0rkk7p049g02bidc7bggl9kf2wzmgmsnx396mqymf";
32
-
};
15
+
patchFlags = "-p2";
16
+
patches = [
17
+
(fetchpatch {
18
+
name = "zimreader_tntnet221.patch";
19
+
url = "https://github.com/wikimedia/openzim/compare/r1.3...juliendehos:3ee5f11eaa811284d340451e6f466529c00f6ef2.patch";
20
+
sha256 = "0rc5n20svyyndqh7hsynjyblfraphgi0f6khw6f5jq89w9i1j1hd";
21
+
})
22
+
];
33
23
24
+
enableParallelBuilding = true;
34
25
buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ];
35
26
setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`";
36
27
preConfigurePhases = [ "./autogen.sh" ];
···
38
29
meta = {
39
30
description = "A tool to serve ZIM files using HTTP";
40
31
homepage = http://git.wikimedia.org/log/openzim;
41
-
maintainers = with stdenv.lib.maintainers; [ robbinch ];
32
+
maintainers = with stdenv.lib.maintainers; [ robbinch juliendehos ];
42
33
platforms = [ "x86_64-linux" ];
43
34
};
44
35
}