From d76e4420af3c959c13419fe1004ba48bf990c585 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 3 Dec 2012 07:11:26 +0100 Subject: [PATCH] pil for python27 and python26 --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66589873ab17..a02a35c7983c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5236,7 +5236,7 @@ let numeric = callPackage ../development/python-modules/numeric { }; - pil = callPackage ../development/python-modules/pil { }; + pil = python27Packages.pil; psyco = callPackage ../development/python-modules/psyco { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3b0828acb8e3..62039b853a66 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -39,6 +39,9 @@ let pythonPackages = python.modules // rec { inherit buildPythonPackage pythonPackages; }; + pil = import ../development/python-modules/pil { + inherit (pkgs) fetchurl stdenv python libjpeg zlib freetype; + }; wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper;