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

paramiko: fix chroot build: use pycrypto from Nixpkgs instead of getting it from the network.

Browse Source 
mysql-workbench: minor cleanup.
Patch by Karn Kallio.

svn path=/nixpkgs/trunk/; revision=24482
This commit is contained in:
Evgeny Egorochkin
2010-10-26 01:42:22 +00:00
parent ee8d2ccc40
commit 35dc7d6f3c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/mysql-workbench/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext { stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext
, glib, glibc, gnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade , glib, glibc, gnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade
, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql , 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 { stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa 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 = '' preConfigure = ''
substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv" substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
pkgs/top-level/python-packages.nix
+2
View File
@@ -562,6 +562,8 @@ rec {
sha256 = "00jhzl3s9xdkbj32h1kq1swk8wpx9zky7qfda40n8mb204xjcn9h"; sha256 = "00jhzl3s9xdkbj32h1kq1swk8wpx9zky7qfda40n8mb204xjcn9h";
}; };
buildInputs = [ pkgs.pycrypto ];
doCheck = false; doCheck = false;
meta = { meta = {