From 212b4df91cccb6bdfaf80b3fc84ea47907e9898b Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 09:53:28 +0100 Subject: [PATCH] recursivePthLoader included via wrapper, not propagated by modules --- pkgs/development/interpreters/python/wrapper.nix | 4 ++-- pkgs/development/python-modules/generic/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index f4892f92b41..0f2f46cd568 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,12 +1,12 @@ # Create a python that knows about additional python packages via # PYTHONPATH -{stdenv, python, makeWrapper, extraLibs ? []}: +{ stdenv, python, makeWrapper, recursivePthLoader, extraLibs ? [] }: stdenv.mkDerivation { name = "python-${python.version}-wrapper"; - propagatedBuildInputs = [python makeWrapper] ++ extraLibs; + propagatedBuildInputs = extraLibs ++ [ python makeWrapper recursivePthLoader ]; unpackPhase = "true"; installPhase = '' diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index d650116ada9..2e5601ae17c 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -53,11 +53,6 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - # recursivePthLoader is responsible for loading pth files - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; - - #buildInputStrings = map toString buildInputs; - pythonPath = [ setuptools ] ++ pythonPath; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b59a8a63dea..c7c97b21da0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2847,6 +2847,7 @@ let python27Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = lib.attrValues python27.modules; python = python27; + inherit (python27Packages) recursivePthLoader; }; pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { };