Remove duplicate expression for PIL (Python Imaging Library).
svn path=/nixpkgs/trunk/; revision=12599
This commit is contained in:
parent
61c0f30155
commit
cf56d20b0d
|
@ -1,41 +0,0 @@
|
||||||
{ fetchurl, stdenv, python
|
|
||||||
, libjpeg, zlib, freetype }:
|
|
||||||
|
|
||||||
let version = "1.1.6";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "python-imaging-${version}";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
|
|
||||||
sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ python libjpeg zlib freetype ];
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
configurePhase = ''
|
|
||||||
sed -i "setup.py" \
|
|
||||||
-e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
|
|
||||||
s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
|
|
||||||
s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildPhase = "python setup.py build_ext -i";
|
|
||||||
checkPhase = "python selftest.py";
|
|
||||||
installPhase = "python setup.py install --prefix=$out";
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = http://www.pythonware.com/products/pil/;
|
|
||||||
description = "The Python Imaging Library (PIL)";
|
|
||||||
|
|
||||||
longDescription = ''
|
|
||||||
The Python Imaging Library (PIL) adds image processing
|
|
||||||
capabilities to your Python interpreter. This library
|
|
||||||
supports many file formats, and provides powerful image
|
|
||||||
processing and graphics capabilities.
|
|
||||||
'';
|
|
||||||
|
|
||||||
license = "http://www.pythonware.com/products/pil/license.htm";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,28 +1,41 @@
|
||||||
args: with args;
|
{ fetchurl, stdenv, python
|
||||||
stdenv.mkDerivation {
|
, libjpeg, zlib, freetype }:
|
||||||
name = "python-imaging-1.1.6";
|
|
||||||
|
|
||||||
|
let version = "1.1.6";
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "python-imaging-${version}";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://effbot.org/downloads/Imaging-1.1.6.tar.gz;
|
url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
|
||||||
sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
|
sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [python zlib libtiff libjpeg freetype];
|
buildInputs = [ python libjpeg zlib freetype ];
|
||||||
|
|
||||||
configurePhase = "
|
doCheck = true;
|
||||||
sed -e 's@FREETYPE_ROOT = None@FREETYPE_ROOT = libinclude(\"${freetype}\")@' -i setup.py
|
|
||||||
sed -e 's@JPEG_ROOT = None@JPEG_ROOT = libinclude(\"${libjpeg}\")@' -i setup.py
|
|
||||||
sed -e 's@TIFF_ROOT = None@TIFF_ROOT = libinclude(\"${libtiff}\")@' -i setup.py
|
|
||||||
sed -e 's@ZLIB_ROOT = None@ZLIB_ROOT = libinclude(\"${zlib}\")@' -i setup.py
|
|
||||||
";
|
|
||||||
|
|
||||||
buildPhase = "true";
|
configurePhase = ''
|
||||||
|
sed -i "setup.py" \
|
||||||
|
-e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
|
||||||
|
s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
|
||||||
|
s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
|
||||||
|
'';
|
||||||
|
|
||||||
installPhase = "yes Y | python setup.py install --prefix=\${out}";
|
buildPhase = "python setup.py build_ext -i";
|
||||||
|
checkPhase = "python selftest.py";
|
||||||
|
installPhase = "python setup.py install --prefix=$out";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "
|
homepage = http://www.pythonware.com/products/pil/;
|
||||||
Python Imaging library.
|
description = "The Python Imaging Library (PIL)";
|
||||||
";
|
|
||||||
|
longDescription = ''
|
||||||
|
The Python Imaging Library (PIL) adds image processing
|
||||||
|
capabilities to your Python interpreter. This library
|
||||||
|
supports many file formats, and provides powerful image
|
||||||
|
processing and graphics capabilities.
|
||||||
|
'';
|
||||||
|
|
||||||
|
license = "http://www.pythonware.com/products/pil/license.htm";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4513,10 +4513,6 @@ let pkgs = rec {
|
||||||
inherit (gtkLibs) glib gtk;
|
inherit (gtkLibs) glib gtk;
|
||||||
};
|
};
|
||||||
|
|
||||||
pyimaging = import ../development/python-modules/imaging {
|
|
||||||
inherit fetchurl stdenv python libjpeg zlib freetype;
|
|
||||||
};
|
|
||||||
|
|
||||||
pyopengl = import ../development/python-modules/pyopengl {
|
pyopengl = import ../development/python-modules/pyopengl {
|
||||||
inherit fetchurl stdenv setuptools mesa freeglut pil;
|
inherit fetchurl stdenv setuptools mesa freeglut pil;
|
||||||
python = python25;
|
python = python25;
|
||||||
|
|
Loading…
Reference in a new issue