Merge pull request #14520 from jb55/bump/wkhtmltopdf

wkhtmltopdf: 0.12.2.4 -> 0.12.3.2
This commit is contained in:
Wout Mertens 2016-04-07 21:40:53 +02:00
commit c3f181f2c9

View file

@ -1,66 +1,108 @@
{ stdenv, fetchgit, qt4, fontconfig, freetype, libpng, zlib, libjpeg { stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg
, openssl, libX11, libXext, libXrender, overrideDerivation }: , openssl, libX11, libXext, libXrender, overrideDerivation }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.12.2.4"; version = "0.12.3.2";
name = "wkhtmltopdf-${version}"; name = "wkhtmltopdf-${version}";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git"; owner = "wkhtmltopdf";
rev = "refs/tags/${version}"; repo = "wkhtmltopdf";
sha256 = "0g96vgi3s633j4myjfzakkyiml1zspvdvbc0q1vhw8fp5n1xdknm"; rev = "${version}";
fetchSubmodules = false; sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s";
}; };
wkQt = overrideDerivation qt4 (deriv: { wkQt = overrideDerivation qt4 (deriv: {
name = "qt-mod-4.8.6"; name = "qt-mod-4.8.7";
enableParallelBuilding = true; enableParallelBuilding = true;
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/wkhtmltopdf/qt.git"; owner = "wkhtmltopdf";
rev = "48e71c19c7fc67517fb3dca6d42eacb57341c9ba"; # From git submodule spec in wkhtml repo. repo = "qt";
sha256 = "1ygr7g3k900zjf54ji6kkfppqnxaqwbh8npr53g2krdw3bmny6fx"; rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo.
sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23";
}; };
configureFlags = configureFlags =
'' ''
-v -no-separate-debug-info -release -confirm-license -opensource -dbus-linked
-qdbus -glib -dbus-linked -openssl-linked -glib
-no-separate-debug-info
-openssl-linked
-qdbus
-v
'' ''
+ # This is taken from the wkhtml build script that we don't run + # This is taken from the wkhtml build script that we don't run
'' ''
-fast -confirm-license
-static
-exceptions -exceptions
-xmlpatterns -fast
-webkit -graphicssystem raster
-system-zlib -iconv
-system-libpng -largefile
-system-libjpeg -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-libmng
-no-libtiff -no-libtiff
-no-accessibility -nomake demos
-no-stl -nomake docs
-no-qt3support -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
-no-phonon-backend -no-phonon-backend
-no-opengl -no-qt3support
-no-declarative -no-rpath
-no-scripttools
-no-sm
-no-sql-ibase -no-sql-ibase
-no-sql-mysql -no-sql-mysql
-no-sql-odbc -no-sql-odbc
-no-sql-psql -no-sql-psql
-no-sql-sqlite -no-sql-sqlite
-no-sql-sqlite2 -no-sql-sqlite2
-no-mmx
-no-3dnow
-no-sse -no-sse
-no-sse2 -no-sse2
-no-multimedia -no-sse3
-nomake demos -no-sse4.1
-nomake docs -no-sse4.2
-nomake examples -no-ssse3
-nomake tools -no-stl
-nomake tests -no-xcursor
-nomake translations -no-xfixes
-no-xinerama
-no-xinput
-no-xkb
-no-xrandr
-no-xshape
-no-xsync
-opensource
-openssl
-release
-static
-system-libjpeg
-system-libpng
-system-zlib
-webkit
-xmlpatterns
''; '';
}); });