pyrox.dev
lol
Merge pull request #10659 from jb55/wkhtmltopdf-bump
wkhtmltopdf: 0.12.1 -> 0.12.2.4
+10
-7
+10
-7
pkgs/tools/graphics/wkhtmltopdf/default.nix
+10
-7
pkgs/tools/graphics/wkhtmltopdf/default.nix
···
2
2
, openssl, libX11, libXext, libXrender, overrideDerivation }:
3
3
4
4
stdenv.mkDerivation rec {
5
-
version = "0.12.1";
5
+
version = "0.12.2.4";
6
6
name = "wkhtmltopdf-${version}";
7
7
8
8
src = fetchgit {
9
9
url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git";
10
10
rev = "refs/tags/${version}";
11
-
sha256 = "0wjzaaviy1k3z8r2kzb2rmyx6xdj23a338b86sxcb15ws3kzwgwh";
11
+
sha256 = "0g96vgi3s633j4myjfzakkyiml1zspvdvbc0q1vhw8fp5n1xdknm";
12
+
fetchSubmodules = false;
12
13
};
13
14
14
15
wkQt = overrideDerivation qt4 (deriv: {
15
16
name = "qt-mod-4.8.6";
17
+
enableParallelBuilding = true;
16
18
src = fetchgit {
17
19
url = "https://github.com/wkhtmltopdf/qt.git";
18
-
rev = "82b568b"; # From git submodule spec in wkhtml repo.
19
-
sha256 = "0whppwxnymh5bdayqsqx54n074m99yk6v78z7f0k5prja55yvwyx";
20
+
rev = "48e71c19c7fc67517fb3dca6d42eacb57341c9ba"; # From git submodule spec in wkhtml repo.
21
+
sha256 = "1ygr7g3k900zjf54ji6kkfppqnxaqwbh8npr53g2krdw3bmny6fx";
20
22
};
21
23
configureFlags =
22
24
''
···
67
69
];
68
70
69
71
configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
70
-
72
+
71
73
patches = [ ./makefix.patch ];
72
74
73
75
enableParallelBuilding = true;
74
76
75
-
meta = {
77
+
meta = with stdenv.lib; {
76
78
homepage = http://wkhtmltopdf.org/;
77
79
description = "Tools for rendering web pages to PDF or images";
78
80
longDescription = ''
···
83
85
84
86
There is also a C library, if you're into that kind of thing.
85
87
'';
86
-
license = stdenv.lib.licenses.gpl3Plus;
88
+
license = licenses.gpl3Plus;
89
+
maintainers = with maintainers; [ jb55 ];
87
90
};
88
91
}