tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
pdfread: use pillow instead of pil
Frederik Rietdijk
10 years ago
4bcfa144
47dc242b
+5
-3
2 changed files
expand all
collapse all
unified
split
pkgs
tools
graphics
pdfread
default.nix
top-level
all-packages.nix
+2
-2
pkgs/tools/graphics/pdfread/default.nix
···
1
1
-
{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pil, djvulibre
1
1
+
{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre
2
2
, optipng, unrar}:
3
3
4
4
stdenv.mkDerivation {
···
38
38
mkdir -p $PYDIR
39
39
cp -R *.py pylrs $PYDIR
40
40
41
41
-
wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \
41
41
+
wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \
42
42
--prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin
43
43
'';
44
44
+3
-1
pkgs/top-level/all-packages.nix
···
2671
2671
2672
2672
jbig2enc = callPackage ../tools/graphics/jbig2enc { };
2673
2673
2674
2674
-
pdfread = callPackage ../tools/graphics/pdfread { };
2674
2674
+
pdfread = callPackage ../tools/graphics/pdfread {
2675
2675
+
inherit (pythonPackages) pillow;
2676
2676
+
};
2675
2677
2676
2678
briss = callPackage ../tools/graphics/briss { };
2677
2679