diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-11-11 16:24:38 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-11-23 15:11:03 +0100 |
| commit | 80329e71235d088e590ae044e96dabeb4ace3215 (patch) | |
| tree | 0fb85dc4bb7933934bd2f8e41a01160ee794ce78 /pkgs/development/interpreters/python/mk-python-derivation.nix | |
| parent | 7c3c2a0dcabf21478d4f895fd4aef6a9606d3835 (diff) | |
| download | nixpkgs-80329e71235d088e590ae044e96dabeb4ace3215.tar nixpkgs-80329e71235d088e590ae044e96dabeb4ace3215.tar.gz nixpkgs-80329e71235d088e590ae044e96dabeb4ace3215.tar.bz2 nixpkgs-80329e71235d088e590ae044e96dabeb4ace3215.tar.lz nixpkgs-80329e71235d088e590ae044e96dabeb4ace3215.tar.xz nixpkgs-80329e71235d088e590ae044e96dabeb4ace3215.tar.zst nixpkgs-80329e71235d088e590ae044e96dabeb4ace3215.zip | |
python.pkgs.buildPythonPackage: some comments
Diffstat (limited to 'pkgs/development/interpreters/python/mk-python-derivation.nix')
| -rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index b7327706d24..a0cac7d1ddd 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -1,4 +1,4 @@ -/* Generic builder for Python packages that come without a setup.py. */ +# Generic builder. { lib , python @@ -60,13 +60,15 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs [ name = namePrefix + name; - - buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath - ++ [ (ensureNewerSourcesHook { year = "1980"; }) ] + buildInputs = ([ wrapPython (ensureNewerSourcesHook { year = "1980"; }) ] ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) - ++ lib.optionals doCheck checkInputs; + ++ lib.optionals doCheck checkInputs + ++ lib.optional catchConflicts setuptools # If we nog longer propagate setuptools + ++ buildInputs + ++ pythonPath + ); - # propagate python/setuptools to active setup-hook in nix-shell + # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; # Python packages don't have a checkPhase, only an installCheckPhase |