Merge recent master into staging

Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
parent 3ecd4dcf72 8d67b707c7
commit 2cf17b0802
271 changed files with 5900 additions and 2711 deletions
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -10,6 +10,8 @@
 , sqlite
 , tcl, tk
 , zlib
+, callPackage
+, self
 }:

 assert readline != null -> ncurses != null;
@@ -67,6 +69,7 @@ stdenv.mkDerivation {
    tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
    libPrefix = "python${majorVersion}";
    executable = "python3.4m";
+    buildEnv = callPackage ../wrapper.nix { python = self; };
    isPy3 = true;
    isPy34 = true;
    is_py3k = true;  # deprecated