public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

poppler: Add support for gobject-introspection

Browse Source 
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 <aszlig@redmoonstudios.org>
Cc: @ttuegel
This commit is contained in:
aszlig 2016-12-19 11:24:59 +01:00
parent 0409ce2330
commit f805209a78
No known key found for this signature in database
GPG Key ID: 1DE8E48E57DB5436
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/poppler/default.nix
View File

@ -3,6 +3,7 @@
, withData ? false, poppler_data , withData ? false, poppler_data
, qt4Support ? false, qt4 ? null , qt4Support ? false, qt4 ? null
, qt5Support ? false, qtbase ? null , qt5Support ? false, qtbase ? null
, introspectionSupport ? false, gobjectIntrospection ? null
, utils ? false , utils ? false
, minimal ? false, suffix ? "glib" , minimal ? false, suffix ? "glib"
}: }:
@ -28,7 +29,8 @@ stdenv.mkDerivation rec {
[ zlib freetype fontconfig libjpeg openjpeg ] [ zlib freetype fontconfig libjpeg openjpeg ]
++ optionals (!minimal) [ cairo lcms curl ] ++ optionals (!minimal) [ cairo lcms curl ]
++ optional qt4Support qt4 ++ optional qt4Support qt4
++ optional qt5Support qtbase; ++ optional qt5Support qtbase
++ optional introspectionSupport gobjectIntrospection;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -47,7 +49,8 @@ stdenv.mkDerivation rec {
"--disable-poppler-glib" "--disable-poppler-cpp" "--disable-poppler-glib" "--disable-poppler-cpp"
"--disable-libcurl" "--disable-libcurl"
] ]
++ optional (!utils) "--disable-utils" ; ++ optional (!utils) "--disable-utils"
++ optional introspectionSupport "--enable-introspection";
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/top-level/all-packages.nix
View File

@ -8926,6 +8926,10 @@ in
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
poppler_gi = lowPrio (poppler.override {
introspectionSupport = true;
});
poppler_min = poppler.override { # TODO: maybe reduce even more poppler_min = poppler.override { # TODO: maybe reduce even more
minimal = true; minimal = true;
suffix = "min"; suffix = "min";