diff options
Diffstat (limited to 'pkgs/tools/graphics/wkhtmltopdf/default.nix')
-rw-r--r-- | pkgs/tools/graphics/wkhtmltopdf/default.nix | 112 |
1 files changed, 6 insertions, 106 deletions
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 3ecd91aaca14..14ba0f8c2a9a 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,113 +1,21 @@ -{ stdenv, fetchFromGitHub, fetchpatch, qt4, fontconfig, freetype, libpng, zlib, libjpeg -, openssl, libX11, libXext, libXrender, overrideDerivation }: +{ stdenv, fetchFromGitHub, qt5, fontconfig, freetype, libpng, zlib, libjpeg +, openssl, libX11, libXext, libXrender }: stdenv.mkDerivation rec { - version = "0.12.4"; + version = "0.12.5"; name = "wkhtmltopdf-${version}"; src = fetchFromGitHub { owner = "wkhtmltopdf"; repo = "wkhtmltopdf"; rev = version; - sha256 = "09yzj9ylc6ci4a1qlhz60cgxi1nm9afwjrjxfikf8wwjd3i24vp2"; + sha256 = "0i6b6z3f4szspbbi23qr3hv22j9bhmcj7c1jizr7y0ra43mrgws1"; }; - wkQt = overrideDerivation qt4 (deriv: { - name = "qt-mod-4.8.7"; - enableParallelBuilding = true; - src = fetchFromGitHub { - owner = "wkhtmltopdf"; - repo = "qt"; - rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo. - sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23"; - }; - configureFlags = - '' - -dbus-linked - -glib - -no-separate-debug-info - -openssl-linked - -qdbus - -v - '' - + # This is taken from the wkhtml build script that we don't run - '' - -confirm-license - -exceptions - -fast - -graphicssystem raster - -iconv - -largefile - -no-3dnow - -no-accessibility - -no-audio-backend - -no-avx - -no-cups - -no-dbus - -no-declarative - -no-glib - -no-gstreamer - -no-gtkstyle - -no-icu - -no-javascript-jit - -no-libmng - -no-libtiff - -nomake demos - -nomake docs - -nomake examples - -nomake tests - -nomake tools - -nomake translations - -no-mitshm - -no-mmx - -no-multimedia - -no-nas-sound - -no-neon - -no-nis - -no-opengl - -no-openvg - -no-pch - -no-phonon - -no-phonon-backend - -no-qt3support - -no-rpath - -no-scripttools - -no-sm - -no-sql-ibase - -no-sql-mysql - -no-sql-odbc - -no-sql-psql - -no-sql-sqlite - -no-sql-sqlite2 - -no-sse - -no-sse2 - -no-sse3 - -no-sse4.1 - -no-sse4.2 - -no-ssse3 - -no-stl - -no-xcursor - -no-xfixes - -no-xinerama - -no-xinput - -no-xkb - -no-xrandr - -no-xshape - -no-xsync - -opensource - -release - -static - -system-libjpeg - -system-libpng - -system-zlib - -webkit - -xmlpatterns - ''; - }); - buildInputs = [ - wkQt fontconfig freetype libpng zlib libjpeg openssl + fontconfig freetype libpng zlib libjpeg openssl libX11 libXext libXrender + qt5.qtwebkit qt5.qtsvg ]; prePatch = '' @@ -116,14 +24,6 @@ stdenv.mkDerivation rec { 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"; - }) - ]; - configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; enableParallelBuilding = true; |