From f805209a78a1a38cc13c9deac72a6433b6f5ba7b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 19 Dec 2016 11:24:59 +0100 Subject: poppler: Add support for gobject-introspection This optionally adds support for GI, because it's needed for paperwork-backend. The new poppler_gi attribute is also marked as lowPrio so that users won't accidentally install it. Signed-off-by: aszlig Cc: @ttuegel --- pkgs/development/libraries/poppler/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index d3a51acd33aa..89368282f2c9 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -3,6 +3,7 @@ , withData ? false, poppler_data , qt4Support ? false, qt4 ? null , qt5Support ? false, qtbase ? null +, introspectionSupport ? false, gobjectIntrospection ? null , utils ? false , minimal ? false, suffix ? "glib" }: @@ -28,7 +29,8 @@ stdenv.mkDerivation rec { [ zlib freetype fontconfig libjpeg openjpeg ] ++ optionals (!minimal) [ cairo lcms curl ] ++ optional qt4Support qt4 - ++ optional qt5Support qtbase; + ++ optional qt5Support qtbase + ++ optional introspectionSupport gobjectIntrospection; nativeBuildInputs = [ pkgconfig ]; @@ -47,7 +49,8 @@ stdenv.mkDerivation rec { "--disable-poppler-glib" "--disable-poppler-cpp" "--disable-libcurl" ] - ++ optional (!utils) "--disable-utils" ; + ++ optional (!utils) "--disable-utils" + ++ optional introspectionSupport "--enable-introspection"; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9ed052f1f46..3f8a7bebe383 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8926,6 +8926,10 @@ in poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; + poppler_gi = lowPrio (poppler.override { + introspectionSupport = true; + }); + poppler_min = poppler.override { # TODO: maybe reduce even more minimal = true; suffix = "min"; -- cgit 1.4.1