From 9e646d4689139e200bc399b7855633899ab5cc99 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 27 Feb 2012 17:33:55 +0000
Subject: [PATCH] added unzip to buildPythonPackage's buildInputs - used quite
 often

authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32624
---
 pkgs/development/python-modules/generic/default.nix |  4 ++--
 pkgs/top-level/python-packages.nix                  | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 5f85d837c3c6..c208c0bcff26 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -3,7 +3,7 @@
    (http://pypi.python.org/pypi/setuptools/), which represents a large
    number of Python packages nowadays.  */
 
-{ python, setuptools, wrapPython, lib, site, offlineDistutils }:
+{ python, setuptools, wrapPython, lib, site, offlineDistutils, unzip }:
 
 { name, namePrefix ? "python-"
 
@@ -71,7 +71,7 @@ python.stdenv.mkDerivation (attrs // {
 
   name = namePrefix + name;
 
-  buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
+  buildInputs = [ python wrapPython setuptools unzip ] ++ buildInputs ++ pythonPath;
 
   preConfigure = ''
     # do not allow distutils to make downloads, whatever install command is used
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7e5a880c027e..81f3783eadfc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8,7 +8,7 @@ let pythonPackages = python.modules // rec {
 
 
   buildPythonPackage = import ../development/python-modules/generic {
-    inherit (pkgs) lib;
+    inherit (pkgs) lib unzip;
     inherit python wrapPython setuptools site offlineDistutils;
   };
 
@@ -84,7 +84,7 @@ let pythonPackages = python.modules // rec {
       sha1 = "fa4aec08e59fa5964197f59ba42408d64031675b";
     };
 
-    buildInputs = [ pkgs.unzip pkgs.sqlite ];
+    buildInputs = [ pkgs.sqlite ];
 
     doCheck = false;
 
@@ -103,8 +103,6 @@ let pythonPackages = python.modules // rec {
       sha256 = "ee6da1aaad8b08a74a33eb82264b1a2bf12a7d5aefc7e9d7d40a8f8fa9912e62";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     # How do we run the tests?
     doCheck = false;
 
@@ -288,8 +286,6 @@ let pythonPackages = python.modules // rec {
       sha256 = "1i5n97l20kn2w9v6x8ybcdnl323vy8lcc5qlxz5l89di36a2skgw";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     # The tests fail - I don't know why
     doCheck = false;
 
@@ -1641,7 +1637,7 @@ let pythonPackages = python.modules // rec {
       sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040";
     };
 
-    buildInputs = [ pkgs.unzip pkgs.pyrex ];
+    buildInputs = [ pkgs.pyrex ];
     propagatedBuildInputs = [ pkgs.libyaml ];
 
     meta = {
@@ -2117,8 +2113,6 @@ let pythonPackages = python.modules // rec {
       md5 = "8e46dd755f6998d471bfbcb4def897ff";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     # The test requires "webtest", which is a cyclic dependency.  (WTF?)
     doCheck = false;