diff options
| author | Domen Kožar <domen@dev.si> | 2014-10-19 19:48:07 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-10-19 19:48:18 +0200 |
| commit | 2d6582d14e34072924921874b18adb84fec9391f (patch) | |
| tree | 5df7408d4dad22c9addd5ae0e50c3491eb88d08b /pkgs/development/interpreters/python/wrapper.nix | |
| parent | 67a1a96b499767bd70ff737b33329e710eb81c5b (diff) | |
| download | nixpkgs-2d6582d14e34072924921874b18adb84fec9391f.tar nixpkgs-2d6582d14e34072924921874b18adb84fec9391f.tar.gz nixpkgs-2d6582d14e34072924921874b18adb84fec9391f.tar.bz2 nixpkgs-2d6582d14e34072924921874b18adb84fec9391f.tar.lz nixpkgs-2d6582d14e34072924921874b18adb84fec9391f.tar.xz nixpkgs-2d6582d14e34072924921874b18adb84fec9391f.tar.zst nixpkgs-2d6582d14e34072924921874b18adb84fec9391f.zip | |
python27FullBuildEnv -> python.buildEnv for all interpreters
Diffstat (limited to 'pkgs/development/interpreters/python/wrapper.nix')
| -rw-r--r-- | pkgs/development/interpreters/python/wrapper.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 37180b1472b..163e8d7194b 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,10 +1,14 @@ -{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? "" +{ stdenv, python, buildEnv, makeWrapper +, extraLibs ? [] +, postBuild ? "" , ignoreCollisions ? false }: # Create a python executable that knows about additional packages. - +let + recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; +in (buildEnv { - name = "python-${python.version}-env"; + name = "${python.name}-env"; paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; inherit ignoreCollisions; |