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

use recursivePthLoader instead of setuptoolsSite

This commit is contained in:
Florian Friesdorf 2012-12-14 20:21:18 +01:00
parent 45635e9e0f
commit 886742d91a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/generic/default.nix
View File

@ -3,7 +3,7 @@
(http://pypi.python.org/pypi/setuptools/), which represents a large (http://pypi.python.org/pypi/setuptools/), which represents a large
number of Python packages nowadays. */ number of Python packages nowadays. */
{ python, setuptools, wrapPython, lib, offlineDistutils, setuptoolsSite }: { python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }:
{ name, namePrefix ? "python-" { name, namePrefix ? "python-"
@ -51,8 +51,8 @@ python.stdenv.mkDerivation (attrs // {
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
# setuptoolsSite is responsible for loading pth files # recursivePthLoader is responsible for loading pth files
propagatedBuildInputs = propagatedBuildInputs ++ [ setuptoolsSite ]; propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];
buildInputStrings = map toString buildInputs; buildInputStrings = map toString buildInputs;

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

@ -9,7 +9,7 @@ let pythonPackages = python.modules // rec {
buildPythonPackage = import ../development/python-modules/generic { buildPythonPackage = import ../development/python-modules/generic {
inherit (pkgs) lib; inherit (pkgs) lib;
inherit python wrapPython setuptools setuptoolsSite offlineDistutils; inherit python wrapPython setuptools recursivePthLoader offlineDistutils;
}; };