3
0
Fork 0
forked from mirrors/nixpkgs

pdfread: use pillow instead of pil

This commit is contained in:
Frederik Rietdijk 2015-12-08 15:14:59 +01:00
parent 47dc242b9d
commit 4bcfa14480
2 changed files with 5 additions and 3 deletions

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pil, djvulibre {stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre
, optipng, unrar}: , optipng, unrar}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -38,7 +38,7 @@ stdenv.mkDerivation {
mkdir -p $PYDIR mkdir -p $PYDIR
cp -R *.py pylrs $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 --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin
''; '';

View file

@ -2671,7 +2671,9 @@ let
jbig2enc = callPackage ../tools/graphics/jbig2enc { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { };
pdfread = callPackage ../tools/graphics/pdfread { }; pdfread = callPackage ../tools/graphics/pdfread {
inherit (pythonPackages) pillow;
};
briss = callPackage ../tools/graphics/briss { }; briss = callPackage ../tools/graphics/briss { };