diff options
| author | midchildan <midchildan+git@gmail.com> | 2017-05-26 10:09:22 +0900 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-05-26 13:49:22 +0300 |
| commit | 586abbf73771c53b593d91c8281b01e241d327a7 (patch) | |
| tree | 132b3892da267538d9f97207eefa72f8c09b07ca | |
| parent | e284740dd5265a8f30699692aa1bb59df5dfb9d6 (diff) | |
| download | nixlib-586abbf73771c53b593d91c8281b01e241d327a7.tar nixlib-586abbf73771c53b593d91c8281b01e241d327a7.tar.gz nixlib-586abbf73771c53b593d91c8281b01e241d327a7.tar.bz2 nixlib-586abbf73771c53b593d91c8281b01e241d327a7.tar.lz nixlib-586abbf73771c53b593d91c8281b01e241d327a7.tar.xz nixlib-586abbf73771c53b593d91c8281b01e241d327a7.tar.zst nixlib-586abbf73771c53b593d91c8281b01e241d327a7.zip | |
poppler: Include poppler encoding data by default
| -rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/pdf2htmlEX/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 89368282f2c9..20e35fa3e089 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg -, withData ? false, poppler_data +, withData ? true, poppler_data , qt4Support ? false, qt4 ? null , qt5Support ? false, qtbase ? null , introspectionSupport ? false, gobjectIntrospection ? null diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix index a75e883b179b..b6d29052dcce 100644 --- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix +++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { glib cairo pango - (poppler.override { withData = true; }) + poppler fontforge openjdk8 ]; |