diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
| commit | 375bc8def7c17506bc10f3b6193635f05d5ccc40 (patch) | |
| tree | 6af7662b245e7998bd18ae20d9e74922c489fb6d /pkgs/development/python-modules/generic/default.nix | |
| parent | 2f75c6845981b38a698cf1a9f620145877c80956 (diff) | |
| parent | 7f9ccc628403ed88844a4436da3b2944be5560a4 (diff) | |
| download | nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.gz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.bz2 nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.lz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.xz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.zst nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.zip | |
Merge staging into closure-size
Diffstat (limited to 'pkgs/development/python-modules/generic/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/generic/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 20fb2ec496b..b962e9f8472 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -62,10 +62,10 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl ] ++ buildInputs ++ pythonPath ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip); - # propagate python to active setup-hook in nix-shell - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python ]; + # propagate python/setuptools to active setup-hook in nix-shell + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python setuptools ]; - pythonPath = [ setuptools ] ++ pythonPath; + pythonPath = pythonPath; configurePhase = attrs.configurePhase or '' runHook preConfigure |