diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-10-23 17:40:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-10-23 17:40:41 +0200 |
| commit | 2cf17b080206ef008d7b0d8f443f3cebd2c052ea (patch) | |
| tree | f49a9b7299028462ba3c8be0da456284917dda8a /pkgs/development/interpreters/python/2.7 | |
| parent | 3ecd4dcf722ae4837be7cb60cef30a59a13b0a12 (diff) | |
| parent | 8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f (diff) | |
| download | nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar.gz nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar.bz2 nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar.lz nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar.xz nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar.zst nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.zip | |
Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
Diffstat (limited to 'pkgs/development/interpreters/python/2.7')
| -rw-r--r-- | pkgs/development/interpreters/python/2.7/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 72c61e1f2358..e7c5326ddd49 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11 }: +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11, self, callPackage }: assert zlibSupport -> zlib != null; @@ -88,6 +88,7 @@ let inherit zlibSupport; isPy2 = true; isPy27 = true; + buildEnv = callPackage ../wrapper.nix { python = self; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; |