From 03a7e360c2b1017a8512297e8761e40c35eb6fab Mon Sep 17 00:00:00 2001
From: egorochkin <egorochkin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date: Tue, 26 Oct 2010 01:42:22 +0000
Subject: [PATCH] paramiko: fix chroot build: use pycrypto from Nixpkgs instead
 of getting it from the network. mysql-workbench: minor cleanup. Patch by Karn
 Kallio.

git-svn-id: https://svn.nixos.org/repos/nix/nixpkgs/trunk@24482 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
---
 pkgs/applications/misc/mysql-workbench/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix                 | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 60cf59a53..f3aac956c 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext
 , glib, glibc, gnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade
 , libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
-, pango, paramiko, pcre, pexpect, pkgconfig, python, sqlite
+, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
     libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
-    mysql paramiko pcre pexpect pkgconfig python sqlite ];
+    mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
 
   preConfigure = ''
     substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a380e5f30..2b780ce68 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -562,6 +562,8 @@ rec {
       sha256 = "00jhzl3s9xdkbj32h1kq1swk8wpx9zky7qfda40n8mb204xjcn9h";
     };
 
+    buildInputs = [ pkgs.pycrypto ];
+
     doCheck = false;
 
     meta = {
-- 
2.11.4.GIT