diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-12 11:29:41 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-12 12:03:37 +0200 |
commit | 51e0f8f759250b77a7ab7529f5c7da5053465ff4 (patch) | |
tree | 50de122859daf1dd33084735165df62fcb09d2e8 /pkgs/tools/graphics/wkhtmltopdf/default.nix | |
parent | fc873b69f08a881fe16d6d09e3c829fe1bc2396a (diff) | |
parent | e25665591b66038c668418c58eaf2810d8f1c90e (diff) | |
download | nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar.gz nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar.bz2 nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar.lz nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar.xz nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar.zst nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.zip |
Merge branch 'master' into staging
Some more larger rebuilds from master.
Diffstat (limited to 'pkgs/tools/graphics/wkhtmltopdf/default.nix')
-rw-r--r-- | pkgs/tools/graphics/wkhtmltopdf/default.nix | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 24c4f2433c6f..b513115c68fe 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg +{ stdenv, fetchFromGitHub, fetchpatch, qt4, fontconfig, freetype, libpng, zlib, libjpeg , openssl, libX11, libXext, libXrender, overrideDerivation }: stdenv.mkDerivation rec { - version = "0.12.3.2"; + version = "0.12.4"; name = "wkhtmltopdf-${version}"; src = fetchFromGitHub { owner = "wkhtmltopdf"; repo = "wkhtmltopdf"; - rev = "${version}"; - sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s"; + rev = version; + sha256 = "09yzj9ylc6ci4a1qlhz60cgxi1nm9afwjrjxfikf8wwjd3i24vp2"; }; wkQt = overrideDerivation qt4 (deriv: { @@ -105,13 +105,26 @@ stdenv.mkDerivation rec { ''; }); - buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl - libX11 libXext libXrender - ]; + buildInputs = [ + wkQt fontconfig freetype libpng zlib libjpeg openssl + libX11 libXext libXrender + ]; - configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; + prePatch = '' + for f in src/image/image.pro src/pdf/pdf.pro ; do + substituteInPlace $f --replace '$(INSTALL_ROOT)' "" + done + ''; + + patches = [ + (fetchpatch { + name = "make-0.12.4-compile.patch"; + url = "https://github.com/efx/aports/raw/eb9f8e6bb9a488460929db747b15b8fceddd7abd/testing/wkhtmltopdf/10-patch1.patch"; + sha256 = "1c136jz0klr2rmhmy13gdbgsgkpjfdp2sif8bnw8d23mr9pym3s1"; + }) + ]; - patches = [ ./makefix.patch ]; + configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; enableParallelBuilding = true; |