From ab423e636777c558854da61e284703b2ddc9999e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 13 Nov 2014 21:02:45 +0100 Subject: [PATCH] buildPythonPackage: add python to propagatedBuildInputs Doing: $ nix-shell -p pythonPackage.pyramid now also sets $PYTHONPATH. Previously you'd have to do: $ nix-shell -p pythonPackage.pyramid python --- pkgs/development/python-modules/generic/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 6ec7934e563..260128a2dda 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -57,12 +57,13 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl name = namePrefix + name; buildInputs = [ - python wrapPython setuptools + wrapPython setuptools (distutils-cfg.override { extraCfg = distutilsExtraCfg; }) ] ++ buildInputs ++ pythonPath ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip); - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; + # propagate python to active setup-hook in nix-shell + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python ]; pythonPath = [ setuptools ] ++ pythonPath;