about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-12-19 11:24:59 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-12-19 22:25:34 +0100
commitf805209a78a1a38cc13c9deac72a6433b6f5ba7b (patch)
tree60442964f5e50226d99d90c0e5feb9caaa58c96b
parent0409ce23303a0b194a10c1cb81971a03066d7770 (diff)
downloadnixlib-f805209a78a1a38cc13c9deac72a6433b6f5ba7b.tar
nixlib-f805209a78a1a38cc13c9deac72a6433b6f5ba7b.tar.gz
nixlib-f805209a78a1a38cc13c9deac72a6433b6f5ba7b.tar.bz2
nixlib-f805209a78a1a38cc13c9deac72a6433b6f5ba7b.tar.lz
nixlib-f805209a78a1a38cc13c9deac72a6433b6f5ba7b.tar.xz
nixlib-f805209a78a1a38cc13c9deac72a6433b6f5ba7b.tar.zst
nixlib-f805209a78a1a38cc13c9deac72a6433b6f5ba7b.zip
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 <aszlig@redmoonstudios.org>
Cc: @ttuegel
-rw-r--r--pkgs/development/libraries/poppler/default.nix7
-rw-r--r--pkgs/top-level/all-packages.nix4
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";