poppler: Include poppler encoding data by default

2017-05-26 10:09:22 +09:00 · 2017-05-26 10:09:22 +09:00 · 586abbf737
commit 586abbf737
parent e284740dd5
2 changed files with 2 additions and 2 deletions
--- 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
--- 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
  ];