diff options
author | Pascal Wittmann <PascalWittmann@gmx.net> | 2015-11-09 13:32:32 +0100 |
---|---|---|
committer | Pascal Wittmann <PascalWittmann@gmx.net> | 2015-11-09 13:32:32 +0100 |
commit | f5d1642a227e1192634ee867a1e6f028305d9ff4 (patch) | |
tree | 037e91286870a5c5cdc9dfd46bd8fc77afaaea4b | |
parent | d9f64f975b818fa6ba8d80058f73380cead3dd34 (diff) | |
parent | feb1e8f0464f58da2e1f54e97bf08cfcaab70e40 (diff) |
Merge pull request #10659 from jb55/wkhtmltopdf-bump
wkhtmltopdf: 0.12.1 -> 0.12.2.4
-rw-r--r-- | pkgs/tools/graphics/wkhtmltopdf/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 2f3929b82b8e0..89ea0e9444402 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -2,21 +2,23 @@ , openssl, libX11, libXext, libXrender, overrideDerivation }: stdenv.mkDerivation rec { - version = "0.12.1"; + version = "0.12.2.4"; name = "wkhtmltopdf-${version}"; src = fetchgit { url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git"; rev = "refs/tags/${version}"; - sha256 = "0wjzaaviy1k3z8r2kzb2rmyx6xdj23a338b86sxcb15ws3kzwgwh"; + sha256 = "0g96vgi3s633j4myjfzakkyiml1zspvdvbc0q1vhw8fp5n1xdknm"; + fetchSubmodules = false; }; wkQt = overrideDerivation qt4 (deriv: { name = "qt-mod-4.8.6"; + enableParallelBuilding = true; src = fetchgit { url = "https://github.com/wkhtmltopdf/qt.git"; - rev = "82b568b"; # From git submodule spec in wkhtml repo. - sha256 = "0whppwxnymh5bdayqsqx54n074m99yk6v78z7f0k5prja55yvwyx"; + rev = "48e71c19c7fc67517fb3dca6d42eacb57341c9ba"; # From git submodule spec in wkhtml repo. + sha256 = "1ygr7g3k900zjf54ji6kkfppqnxaqwbh8npr53g2krdw3bmny6fx"; }; configureFlags = '' @@ -67,12 +69,12 @@ stdenv.mkDerivation rec { ]; configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; - + patches = [ ./makefix.patch ]; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://wkhtmltopdf.org/; description = "Tools for rendering web pages to PDF or images"; longDescription = '' @@ -83,6 +85,7 @@ stdenv.mkDerivation rec { There is also a C library, if you're into that kind of thing. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jb55 ]; }; } |