diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /pkgs/tools/graphics | |
parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) | |
download | nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.gz nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.bz2 nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.lz nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.xz nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.zst nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.zip |
Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/optipng/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/wkhtmltopdf/default.nix | 116 |
3 files changed, 83 insertions, 41 deletions
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 78784580eac..ce620cf3017 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex + [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango ] ++ stdenv.lib.optionals (xorg != null) - (with xorg; [ xlibsWrapper libXrender pango libXaw libXpm ]) + (with xorg; [ xlibsWrapper libXrender libXaw libXpm ]) ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 08f99469d25..767ea0e5425 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "optipng-0.7.5"; + name = "optipng-0.7.6"; src = fetchurl { url = "mirror://sourceforge/optipng/${name}.tar.gz"; - sha256 = "17b197437z5wn29llpwklk7ihgx8bhc913gvjf4zyb81idwlprbl"; + sha256 = "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28"; }; buildInputs = [ libpng ]; diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 89ea0e94444..bcb7803785b 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,72 +1,114 @@ -{ stdenv, fetchgit, qt4, fontconfig, freetype, libpng, zlib, libjpeg +{ stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg , openssl, libX11, libXext, libXrender, overrideDerivation }: stdenv.mkDerivation rec { - version = "0.12.2.4"; + version = "0.12.3.2"; name = "wkhtmltopdf-${version}"; - src = fetchgit { - url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git"; - rev = "refs/tags/${version}"; - sha256 = "0g96vgi3s633j4myjfzakkyiml1zspvdvbc0q1vhw8fp5n1xdknm"; - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "wkhtmltopdf"; + repo = "wkhtmltopdf"; + rev = "${version}"; + sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s"; }; wkQt = overrideDerivation qt4 (deriv: { - name = "qt-mod-4.8.6"; + name = "qt-mod-4.8.7"; enableParallelBuilding = true; - src = fetchgit { - url = "https://github.com/wkhtmltopdf/qt.git"; - rev = "48e71c19c7fc67517fb3dca6d42eacb57341c9ba"; # From git submodule spec in wkhtml repo. - sha256 = "1ygr7g3k900zjf54ji6kkfppqnxaqwbh8npr53g2krdw3bmny6fx"; + src = fetchFromGitHub { + owner = "wkhtmltopdf"; + repo = "qt"; + rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo. + sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23"; }; configureFlags = '' - -v -no-separate-debug-info -release -confirm-license -opensource - -qdbus -glib -dbus-linked -openssl-linked + -dbus-linked + -glib + -no-separate-debug-info + -openssl-linked + -qdbus + -v '' + # This is taken from the wkhtml build script that we don't run '' - -fast - -static + -confirm-license -exceptions - -xmlpatterns - -webkit - -system-zlib - -system-libpng - -system-libjpeg + -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 - -no-accessibility - -no-stl - -no-qt3support + -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-opengl - -no-declarative + -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-mmx - -no-3dnow -no-sse -no-sse2 - -no-multimedia - -nomake demos - -nomake docs - -nomake examples - -nomake tools - -nomake tests - -nomake translations + -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 + -openssl + -release + -static + -system-libjpeg + -system-libpng + -system-zlib + -webkit + -xmlpatterns ''; }); buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl - libX11 libXext libXrender - ]; + libX11 libXext libXrender + ]; configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; |