alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #32953 from obsidiansystems/python-dep-fix

Browse source 
buildPythonPackage: Make setup hook part of nativeBuildInputs
This commit is contained in:
John Ericson 2017-12-21 13:13:28 -08:00 committed by GitHub
parent ab1362b7a5 dc906952be
commit 31e5662785
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/interpreters/python/mk-python-derivation.nix
View file

@ -13,7 +13,10 @@
{ name ? "${attrs.pname}-${attrs.version}"
# Dependencies for building the package
# Build-time dependencies for the package
, nativeBuildInputs ? []
# Run-time dependencies for the package
, buildInputs ? []
# Dependencies needed for running the checkPhase.
@ -66,13 +69,15 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
name = namePrefix + name;
buildInputs = ([ wrapPython (ensureNewerSourcesHook { year = "1980"; }) ]
++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)
nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ]
++ nativeBuildInputs;
buildInputs = [ wrapPython ]
++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip
++ lib.optionals doCheck checkInputs
++ lib.optional catchConflicts setuptools # If we nog longer propagate setuptools
++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools
++ buildInputs
++ pythonPath
);
++ pythonPath;
# Propagate python and setuptools. We should stop propagating setuptools.
propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];