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

pil uses buildPythonPackage and is now actually also built for 2.6

Browse Source
This commit is contained in:
Florian Friesdorf 2012-12-03 07:36:57 +01:00
parent d76e4420af
commit cd905b16af
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/python-modules/pil/default.nix
View File

@ -1,9 +1,9 @@
{ fetchurl, stdenv, python, libjpeg, zlib, freetype }: { fetchurl, stdenv, python, buildPythonPackage, libjpeg, zlib, freetype }:
let version = "1.1.7"; in let version = "1.1.7"; in
stdenv.mkDerivation { buildPythonPackage {
name = "python-imaging-${version}"; name = "imaging-${version}";
src = fetchurl { src = fetchurl {
url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
@ -23,7 +23,7 @@ stdenv.mkDerivation {
buildPhase = "python setup.py build_ext -i"; buildPhase = "python setup.py build_ext -i";
checkPhase = "python selftest.py"; checkPhase = "python selftest.py";
installPhase = "python setup.py install --prefix=$out"; #installPhase = "python setup.py install --prefix=$out";
meta = { meta = {
homepage = http://www.pythonware.com/products/pil/; homepage = http://www.pythonware.com/products/pil/;

5
pkgs/top-level/python-packages.nix
View File

@ -40,7 +40,8 @@ let pythonPackages = python.modules // rec {
}; };
pil = import ../development/python-modules/pil { pil = import ../development/python-modules/pil {
inherit (pkgs) fetchurl stdenv python libjpeg zlib freetype; inherit (pkgs) fetchurl stdenv libjpeg zlib freetype;
inherit python buildPythonPackage;
}; };
wrapPython = pkgs.makeSetupHook wrapPython = pkgs.makeSetupHook
@ -620,7 +621,7 @@ let pythonPackages = python.modules // rec {
sha256 = "1d8vg5a9q2ldnbxqap1893lqb66jwcsli2brbjx7mcnqrzcz449x"; sha256 = "1d8vg5a9q2ldnbxqap1893lqb66jwcsli2brbjx7mcnqrzcz449x";
}; };
propagatedBuildInputs = [ pkgs.pil django_1_3 ]; propagatedBuildInputs = [ pil django_1_3 ];
meta = { meta = {
description = "A collection of useful extensions for Django"; description = "A collection of useful extensions for Django";