JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

buildPython*: fix nativeBuildInputs

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-01-05 10:31:16 +01:00 committed by Frederik Rietdijk
parent 05ee1015bb
commit c5d99308de
2 changed files with 12 additions and 8 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

@ -72,14 +72,17 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr
name = namePrefix + name; name = namePrefix + name;
nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ] nativeBuildInputs = [
++ nativeBuildInputs; python
wrapPython
buildInputs = [ wrapPython ] ensureNewerSourcesForZipFilesHook
++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip setuptools
# ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools # ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools
++ buildInputs ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
++ pythonPath; unzip
] ++ nativeBuildInputs;
buildInputs = buildInputs ++ pythonPath;
# Propagate python and setuptools. We should stop propagating setuptools. # Propagate python and setuptools. We should stop propagating setuptools.
propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];

3
pkgs/development/python-modules/execnet/default.nix
View File

@ -15,7 +15,8 @@ buildPythonPackage rec {
sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a"; sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a";
}; };
buildInputs = [ pytest setuptools_scm ]; checkInputs = [ pytest ];
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ apipkg ]; propagatedBuildInputs = [ apipkg ];
# remove vbox tests # remove vbox tests