JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

impressive: use pillow instead of pil

Browse Source
This commit is contained in:
Frederik Rietdijk 2015-12-08 15:12:17 +01:00
parent c709363e23
commit 0c57716ab9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/office/impressive/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, python, makeWrapper, lib { fetchurl, stdenv, python, makeWrapper, lib
, xpdf, pil, pyopengl, pygame , xpdf, pillow, pyopengl, pygame
, setuptools, mesa, freeglut }: , setuptools, mesa, freeglut }:
let version = "0.10.5"; let version = "0.10.5";
@ -17,7 +17,7 @@ in
# Note: We need to have `setuptools' in the path to be able to use # Note: We need to have `setuptools' in the path to be able to use
# PyOpenGL. # PyOpenGL.
buildInputs = [ makeWrapper xpdf pil pyopengl pygame ]; buildInputs = [ makeWrapper xpdf pillow pyopengl pygame ];
configurePhase = '' configurePhase = ''
sed -i "impressive.py" \ sed -i "impressive.py" \
@ -44,7 +44,7 @@ in
${lib.concatStringsSep ":" ${lib.concatStringsSep ":"
(map (path: (map (path:
path + "/lib/${python.libPrefix}/site-packages") path + "/lib/${python.libPrefix}/site-packages")
[ pil pyopengl pygame setuptools ])} \ [ pillow pyopengl pygame setuptools ])} \
--prefix LIBRARY_PATH ":" "${mesa}/lib:${freeglut}/lib" --prefix LIBRARY_PATH ":" "${mesa}/lib:${freeglut}/lib"
''; '';

1
pkgs/top-level/all-packages.nix
View File

@ -12082,6 +12082,7 @@ let
impressive = callPackage ../applications/office/impressive { impressive = callPackage ../applications/office/impressive {
# XXX These are the PyOpenGL dependencies, which we need here. # XXX These are the PyOpenGL dependencies, which we need here.
inherit (pythonPackages) pyopengl; inherit (pythonPackages) pyopengl;
inherit (pythonPackages) pillow;
}; };
inferno = callPackage_i686 ../applications/inferno { }; inferno = callPackage_i686 ../applications/inferno { };