wkhtmltopdf: 0.12.3.2 -> 0.12.4

+22 -9
+22 -9
pkgs/tools/graphics/wkhtmltopdf/default.nix
··· 1 - { stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg 1 + { stdenv, fetchFromGitHub, fetchpatch, qt4, fontconfig, freetype, libpng, zlib, libjpeg 2 2 , openssl, libX11, libXext, libXrender, overrideDerivation }: 3 3 4 4 stdenv.mkDerivation rec { 5 - version = "0.12.3.2"; 5 + version = "0.12.4"; 6 6 name = "wkhtmltopdf-${version}"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "wkhtmltopdf"; 10 10 repo = "wkhtmltopdf"; 11 - rev = "${version}"; 12 - sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s"; 11 + rev = version; 12 + sha256 = "09yzj9ylc6ci4a1qlhz60cgxi1nm9afwjrjxfikf8wwjd3i24vp2"; 13 13 }; 14 14 15 15 wkQt = overrideDerivation qt4 (deriv: { ··· 105 105 ''; 106 106 }); 107 107 108 - buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl 109 - libX11 libXext libXrender 110 - ]; 108 + buildInputs = [ 109 + wkQt fontconfig freetype libpng zlib libjpeg openssl 110 + libX11 libXext libXrender 111 + ]; 112 + 113 + prePatch = '' 114 + for f in src/image/image.pro src/pdf/pdf.pro ; do 115 + substituteInPlace $f --replace '$(INSTALL_ROOT)' "" 116 + done 117 + ''; 118 + 119 + patches = [ 120 + (fetchpatch { 121 + name = "make-0.12.4-compile.patch"; 122 + url = "https://github.com/efx/aports/raw/eb9f8e6bb9a488460929db747b15b8fceddd7abd/testing/wkhtmltopdf/10-patch1.patch"; 123 + sha256 = "1c136jz0klr2rmhmy13gdbgsgkpjfdp2sif8bnw8d23mr9pym3s1"; 124 + }) 125 + ]; 111 126 112 127 configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; 113 - 114 - patches = [ ./makefix.patch ]; 115 128 116 129 enableParallelBuilding = true; 117 130