diff options
| author | Shea Levy <shea@shealevy.com> | 2018-04-14 20:12:22 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-04-14 20:12:22 -0400 |
| commit | 603a369b8944c2b2f15c67218f345211fafda6fa (patch) | |
| tree | cd3e2114c3e497a2842fa81656de5fb0ae6ac08e /pkgs/build-support/build-setupcfg | |
| parent | 0d3eb701333006ce73b6abadea4d95f52d1105f3 (diff) | |
| download | nixpkgs-603a369b8944c2b2f15c67218f345211fafda6fa.tar nixpkgs-603a369b8944c2b2f15c67218f345211fafda6fa.tar.gz nixpkgs-603a369b8944c2b2f15c67218f345211fafda6fa.tar.bz2 nixpkgs-603a369b8944c2b2f15c67218f345211fafda6fa.tar.lz nixpkgs-603a369b8944c2b2f15c67218f345211fafda6fa.tar.xz nixpkgs-603a369b8944c2b2f15c67218f345211fafda6fa.tar.zst nixpkgs-603a369b8944c2b2f15c67218f345211fafda6fa.zip | |
Revert "buildSetupcfg: Include unzip for zip sources."
Misunderstood the error I was seeing. This reverts commit 0d3eb701333006ce73b6abadea4d95f52d1105f3.
Diffstat (limited to 'pkgs/build-support/build-setupcfg')
| -rw-r--r-- | pkgs/build-support/build-setupcfg/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix index c2d58c3c785..bc6482f0a88 100644 --- a/pkgs/build-support/build-setupcfg/default.nix +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -6,7 +6,7 @@ # * application: Whether this package is a python library or an # application which happens to be written in python. # * doCheck: Whether to run the test suites. -{ pkgs, pythonPackages }: +pythonPackages: { src, info, meta ? {}, application ? false, doCheck ? true }: let build = if application then pythonPackages.buildPythonApplication @@ -16,9 +16,7 @@ in build { inherit src meta doCheck; - nativeBuildInputs = [ - pkgs.unzip - ] ++ map (p: pythonPackages.${p}) ( + nativeBuildInputs = map (p: pythonPackages.${p}) ( (info.setup_requires or []) ++ (if doCheck then (info.tests_require or []) else [])); |