From 4bcfa144802b0003bf64a5378ccb6297e87d7997 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:14:59 +0100 Subject: [PATCH] pdfread: use pillow instead of pil --- pkgs/tools/graphics/pdfread/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 3074b229c55..69ab7f27e34 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pil, djvulibre +{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre , optipng, unrar}: stdenv.mkDerivation { @@ -38,7 +38,7 @@ stdenv.mkDerivation { mkdir -p $PYDIR cp -R *.py pylrs $PYDIR - wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \ + wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \ --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 648162b0cf0..ccf0241cee5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2671,7 +2671,9 @@ let jbig2enc = callPackage ../tools/graphics/jbig2enc { }; - pdfread = callPackage ../tools/graphics/pdfread { }; + pdfread = callPackage ../tools/graphics/pdfread { + inherit (pythonPackages) pillow; + }; briss = callPackage ../tools/graphics/briss { };