summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam Casarin <bill@casarin.me>2015-10-27 17:13:55 -0700
committerWilliam Casarin <bill@casarin.me>2015-10-27 17:15:40 -0700
commit9838265ab359ac3ac0f6a5dbcbf414369178c23e (patch)
treeb5dbb639e7ed691ec094dcaf1351646675b3fcdf
parentd5ea5f0a5dfe25bc78a9dd8b8831be3d599fd2cc (diff)
downloadnixpkgs-9838265ab359ac3ac0f6a5dbcbf414369178c23e.tar
nixpkgs-9838265ab359ac3ac0f6a5dbcbf414369178c23e.tar.gz
nixpkgs-9838265ab359ac3ac0f6a5dbcbf414369178c23e.tar.bz2
nixpkgs-9838265ab359ac3ac0f6a5dbcbf414369178c23e.tar.lz
nixpkgs-9838265ab359ac3ac0f6a5dbcbf414369178c23e.tar.xz
nixpkgs-9838265ab359ac3ac0f6a5dbcbf414369178c23e.tar.zst
nixpkgs-9838265ab359ac3ac0f6a5dbcbf414369178c23e.zip
wkhtmltopdf: 0.12.1 -> 0.12.2.4
-rw-r--r--pkgs/tools/graphics/wkhtmltopdf/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index 2f3929b82b8..295bea4517f 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 =
       ''