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

recursivePthLoader included via wrapper, not propagated by modules

Browse Source
This commit is contained in:
Florian Friesdorf 2013-01-11 09:53:28 +01:00
parent 4329ba3fb1
commit 212b4df91c
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/python/wrapper.nix
View File

@ -1,12 +1,12 @@
# Create a python that knows about additional python packages via # Create a python that knows about additional python packages via
# PYTHONPATH # PYTHONPATH
{stdenv, python, makeWrapper, extraLibs ? []}: { stdenv, python, makeWrapper, recursivePthLoader, extraLibs ? [] }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "python-${python.version}-wrapper"; name = "python-${python.version}-wrapper";
propagatedBuildInputs = [python makeWrapper] ++ extraLibs; propagatedBuildInputs = extraLibs ++ [ python makeWrapper recursivePthLoader ];
unpackPhase = "true"; unpackPhase = "true";
installPhase = '' installPhase = ''

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

@ -53,11 +53,6 @@ python.stdenv.mkDerivation (attrs // {
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
# recursivePthLoader is responsible for loading pth files
propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];
#buildInputStrings = map toString buildInputs;
pythonPath = [ setuptools ] ++ pythonPath; pythonPath = [ setuptools ] ++ pythonPath;
preConfigure = '' preConfigure = ''

1
pkgs/top-level/all-packages.nix
View File

@ -2847,6 +2847,7 @@ let
python27Full = callPackage ../development/interpreters/python/wrapper.nix { python27Full = callPackage ../development/interpreters/python/wrapper.nix {
extraLibs = lib.attrValues python27.modules; extraLibs = lib.attrValues python27.modules;
python = python27; python = python27;
inherit (python27Packages) recursivePthLoader;
}; };
pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { }; pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { };