diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2015-12-08 15:14:59 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2015-12-08 15:15:40 +0100 |
| commit | 4bcfa144802b0003bf64a5378ccb6297e87d7997 (patch) | |
| tree | 53d192622e09168e898145172abc8616d1181d7c | |
| parent | 47dc242b9db1ff5a6c28459770a5191269a46274 (diff) | |
| download | nixpkgs-4bcfa144802b0003bf64a5378ccb6297e87d7997.tar nixpkgs-4bcfa144802b0003bf64a5378ccb6297e87d7997.tar.gz nixpkgs-4bcfa144802b0003bf64a5378ccb6297e87d7997.tar.bz2 nixpkgs-4bcfa144802b0003bf64a5378ccb6297e87d7997.tar.lz nixpkgs-4bcfa144802b0003bf64a5378ccb6297e87d7997.tar.xz nixpkgs-4bcfa144802b0003bf64a5378ccb6297e87d7997.tar.zst nixpkgs-4bcfa144802b0003bf64a5378ccb6297e87d7997.zip | |
pdfread: use pillow instead of pil
| -rw-r--r-- | pkgs/tools/graphics/pdfread/default.nix | 4 | ||||
| -rw-r--r-- | 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 { }; |