From 586abbf73771c53b593d91c8281b01e241d327a7 Mon Sep 17 00:00:00 2001 From: midchildan Date: Fri, 26 May 2017 10:09:22 +0900 Subject: poppler: Include poppler encoding data by default --- pkgs/development/libraries/poppler/default.nix | 2 +- pkgs/tools/typesetting/pdf2htmlEX/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') 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 ]; -- cgit 1.4.1