3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #3841 from monocell/wkhtml-update

updated wkhtmltopdf and use patched qt
This commit is contained in:
Michael Raskin 2014-09-04 01:43:02 +04:00
commit 50cf685019
3 changed files with 101 additions and 8 deletions

View file

@ -1,22 +1,88 @@
{ stdenv, fetchurl, qt4 }:
{ stdenv, fetchgit, qt4, fontconfig, freetype, libpng, zlib, libjpeg
, openssl, libX11, libXext, libXrender, overrideDerivation }:
stdenv.mkDerivation rec {
name = "wkhtmltopdf-0.11.0_rc1";
version = "0.12.1";
name = "wkhtmltopdf-${version}";
src = fetchurl {
url = "http://wkhtmltopdf.googlecode.com/files/${name}.tar.bz2";
sha1 = "db03922d281856e503b3d562614e3936285728c7";
src = fetchgit {
url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git";
rev = "refs/tags/${version}";
sha256 = "0wjzaaviy1k3z8r2kzb2rmyx6xdj23a338b86sxcb15ws3kzwgwh";
};
buildInputs = [ qt4 ];
wkQt = overrideDerivation qt4 (deriv: {
name = "qt-mod-4.8.6";
src = fetchgit {
url = "https://github.com/wkhtmltopdf/qt.git";
rev = "82b568b"; # From git submodule spec in wkhtml repo.
sha256 = "0whppwxnymh5bdayqsqx54n074m99yk6v78z7f0k5prja55yvwyx";
};
configureFlags =
''
-v -no-separate-debug-info -release -confirm-license -opensource
-qdbus -glib -dbus-linked -openssl-linked
''
+ # This is taken from the wkhtml build script that we don't run
''
-fast
-static
-exceptions
-xmlpatterns
-webkit
-system-zlib
-system-libpng
-system-libjpeg
-no-libmng
-no-libtiff
-no-accessibility
-no-stl
-no-qt3support
-no-phonon
-no-phonon-backend
-no-opengl
-no-declarative
-no-sql-ibase
-no-sql-mysql
-no-sql-odbc
-no-sql-psql
-no-sql-sqlite
-no-sql-sqlite2
-no-mmx
-no-3dnow
-no-sse
-no-sse2
-no-multimedia
-nomake demos
-nomake docs
-nomake examples
-nomake tools
-nomake tests
-nomake translations
'';
});
buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl
libX11 libXext libXrender
];
configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
patches = [ ./makefix.patch ];
enableParallelBuilding = true;
meta = {
homepage = http://code.google.com/p/wkhtmltopdf/;
homepage = http://wkhtmltopdf.org/;
description = "Tools for rendering web pages to PDF or images";
longDescription = ''
wkhtmltopdf and wkhtmltoimage are open source (LGPL) command line tools
to render HTML into PDF and various image formats using the QT Webkit
rendering engine. These run entirely "headless" and do not require a
display or display service.
There is also a C library, if you're into that kind of thing.
'';
license = stdenv.lib.licenses.gpl3Plus;
};
}

View file

@ -0,0 +1,24 @@
diff -Naur a/src/image/image.pro b/src/image/image.pro
--- a/src/image/image.pro 2014-08-28 14:07:51.024561967 +0200
+++ b/src/image/image.pro 2014-08-28 14:08:22.383623390 +0200
@@ -25,7 +25,7 @@
unix {
man.path=$$INSTALLBASE/share/man/man1
- man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltoimage.1.gz
+ man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltoimage.1.gz
QMAKE_EXTRA_TARGETS += man
INSTALLS += man
diff -Naur a/src/pdf/pdf.pro b/src/pdf/pdf.pro
--- a/src/pdf/pdf.pro 2014-08-28 14:10:02.305818775 +0200
+++ b/src/pdf/pdf.pro 2014-08-28 14:09:47.360789555 +0200
@@ -25,7 +25,7 @@
unix {
man.path=$$INSTALLBASE/share/man/man1
- man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltopdf.1.gz
+ man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltopdf.1.gz
QMAKE_EXTRA_TARGETS += man
INSTALLS += man

View file

@ -2502,7 +2502,10 @@ let
wicd = callPackage ../tools/networking/wicd { };
wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { };
wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf {
overrideDerivation = lib.overrideDerivation;
inherit (xlibs) libX11 libXext libXrender;
};
wv = callPackage ../tools/misc/wv { };