pycairo: move to pythonPackages

This commit is contained in:
Florian Friesdorf 2013-01-11 15:23:44 +01:00
parent 01f142296a
commit 87423443b8
3 changed files with 8 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, python, pkgconfig, cairo, x11}: { stdenv, fetchurl, python, pkgconfig, cairo, x11 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pycairo-1.8.8"; name = "pycairo-1.8.8";
@ -7,5 +7,5 @@ stdenv.mkDerivation {
sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig"; sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig";
}; };
buildInputs = [python pkgconfig cairo x11]; buildInputs = [ python pkgconfig cairo x11 ];
} }

View File

@ -5299,7 +5299,7 @@ let
psyco = callPackage ../development/python-modules/psyco { }; psyco = callPackage ../development/python-modules/psyco { };
pycairo = callPackage ../development/python-modules/pycairo { }; pycairo = pythonPackages.pycairo;
pycrypto = pythonPackages.pycrypto; pycrypto = pythonPackages.pycrypto;

View File

@ -52,6 +52,11 @@ let pythonPackages = python.modules // rec {
inherit python buildPythonPackage; inherit python buildPythonPackage;
}; };
pycairo = import ../development/python-modules/pycairo {
inherit (pkgs) stdenv fetchurl pkgconfig cairo x11;
inherit python;
};
pycrypto = import ../development/python-modules/pycrypto { pycrypto = import ../development/python-modules/pycrypto {
inherit (pkgs) fetchurl stdenv gmp; inherit (pkgs) fetchurl stdenv gmp;
inherit python buildPythonPackage; inherit python buildPythonPackage;