Merge #2638: fix weechat build on darwin

Conflicts (trivial): pkgs/development/python-modules/pycrypto/default.nix
2014-06-09 19:37:06 +02:00
parent 35f47bcfd8 9b080f87e4
commit 97006eb5ed
4 changed files with 58 additions and 16 deletions
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -13,6 +13,7 @@ buildPythonPackage rec {

  doCheck = !stdenv.isDarwin; # error: AF_UNIX path too long

+
  meta = {
    homepage = "http://www.pycrypto.org/";
    description = "Python Cryptography Toolkit";