From ccb34b093fd370d8886d9325ca81f84e720112f2 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 26 Feb 2012 17:23:05 +0000
Subject: [PATCH] include site for python wrappers to enable deps via pth files

svn path=/nixpkgs/branches/stdenv-updates/; revision=32582
---
 pkgs/development/python-modules/generic/default.nix    | 5 +++--
 pkgs/development/python-modules/setuptools/default.nix | 6 +++---
 pkgs/top-level/python-packages.nix                     | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 210c75acceee..781fc273de4d 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -3,7 +3,7 @@
    (http://pypi.python.org/pypi/setuptools/), which represents a large
    number of Python packages nowadays.  */
 
-{ python, setuptools, wrapPython, lib }:
+{ python, setuptools, wrapPython, lib, site }:
 
 { name, namePrefix ? "python-"
 
@@ -69,7 +69,8 @@ python.stdenv.mkDerivation (attrs // {
 
   buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
 
-  pythonPath = [ setuptools] ++ pythonPath;
+  # XXX: I think setuptools is not needed here
+  pythonPath = [ setuptools site ] ++ pythonPath;
 
   # XXX: Should we run `easy_install --always-unzip'?  It doesn't seem
   # to have a noticeable impact on small scripts.
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 97e77a279d34..c478c25a2fa3 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, wrapPython }:
+{ stdenv, fetchurl, python, wrapPython, site }:
 
 stdenv.mkDerivation rec {
   name = "setuptools-0.6c11";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3";
   };
 
-  buildInputs = [ python wrapPython ];
+  buildInputs = [ python wrapPython site ];
 
   buildPhase = "python setup.py build --build-base $out";
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       # remove generic files, leave setuptools.pth
       rm $dst/site.py*
       rm $dst/easy-install.pth
-      wrapPythonPrograms
+      pythonPath=${site} wrapPythonPrograms
     '';
 
   doCheck = false; # doesn't work with Python 2.7
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb33d0564188..5abc9bc8020a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9,13 +9,13 @@ let pythonPackages = python.modules // rec {
 
   buildPythonPackage = import ../development/python-modules/generic {
     inherit (pkgs) lib;
-    inherit python wrapPython setuptools;
+    inherit python wrapPython setuptools site;
   };
 
 
   setuptools = import ../development/python-modules/setuptools {
     inherit (pkgs) stdenv fetchurl;
-    inherit python wrapPython;
+    inherit python wrapPython site;
   };