diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2013-01-11 15:23:44 +0100 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2013-01-11 15:23:44 +0100 |
| commit | 87423443b8e329b9bc90f1475ef456616e2d477f (patch) | |
| tree | 604a9ffa07a4664154da8f9903b73c21997f5618 /pkgs | |
| parent | 01f142296ab78e2dd57bc6dc83faa3ec91b2aeea (diff) | |
| download | nixlib-87423443b8e329b9bc90f1475ef456616e2d477f.tar nixlib-87423443b8e329b9bc90f1475ef456616e2d477f.tar.gz nixlib-87423443b8e329b9bc90f1475ef456616e2d477f.tar.bz2 nixlib-87423443b8e329b9bc90f1475ef456616e2d477f.tar.lz nixlib-87423443b8e329b9bc90f1475ef456616e2d477f.tar.xz nixlib-87423443b8e329b9bc90f1475ef456616e2d477f.tar.zst nixlib-87423443b8e329b9bc90f1475ef456616e2d477f.zip | |
pycairo: move to pythonPackages
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/pycairo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 8aebf1d78290..1e8ceed6878f 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, pkgconfig, cairo, x11}: +{ stdenv, fetchurl, python, pkgconfig, cairo, x11 }: stdenv.mkDerivation { name = "pycairo-1.8.8"; @@ -7,5 +7,5 @@ stdenv.mkDerivation { sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig"; }; - buildInputs = [python pkgconfig cairo x11]; + buildInputs = [ python pkgconfig cairo x11 ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb7996fc02e7..7b5cc11a7c30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5299,7 +5299,7 @@ let psyco = callPackage ../development/python-modules/psyco { }; - pycairo = callPackage ../development/python-modules/pycairo { }; + pycairo = pythonPackages.pycairo; pycrypto = pythonPackages.pycrypto; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e93f22ed647..72a44f48f332 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -52,6 +52,11 @@ let pythonPackages = python.modules // rec { inherit python buildPythonPackage; }; + pycairo = import ../development/python-modules/pycairo { + inherit (pkgs) stdenv fetchurl pkgconfig cairo x11; + inherit python; + }; + pycrypto = import ../development/python-modules/pycrypto { inherit (pkgs) fetchurl stdenv gmp; inherit python buildPythonPackage; |