diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index ce63f5c9716..9c22430a711 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg -, qt4Support ? false, qt4 ? null, qt5Support ? false, qt5 ? null +, minimal ? false, qt4Support ? false, qt4 ? null, qt5Support ? false, qt5 ? null , utils ? false, suffix ? "glib" }: @@ -16,28 +16,31 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" ] ++ lib.optional (!minimal) "doc"; patches = [ ./datadir_env.patch ]; - propagatedBuildInputs = with stdenv.lib; - [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ] + # TODO: reduce propagation to necessary libs + propagatedBuildInputs = with lib; + [ zlib freetype fontconfig libjpeg lcms curl openjpeg ] + ++ optional (!minimal) cairo ++ optional qt4Support qt4 ++ optional qt5Support qt5.base; nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; - configureFlags = + configureFlags = with lib; [ "--enable-xpdf-headers" "--enable-libcurl" "--enable-zlib" ] - ++ stdenv.lib.optional (!utils) "--disable-utils"; + ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" ] + ++ optional (!utils) "--disable-utils"; enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = http://poppler.freedesktop.org/; description = "A PDF rendering library"; @@ -45,8 +48,8 @@ stdenv.mkDerivation rec { Poppler is a PDF rendering library based on the xpdf-3.0 code base. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e806bb1bd1..cf5aee38ca2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7780,6 +7780,11 @@ let poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; + poppler_min = poppler.override { # TODO: maybe reduce even more + minimal = true; + suffix = "min"; + }; + poppler_qt4 = poppler.override { qt4Support = true; suffix = "qt4";