swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

python-wrapper: add 'ignoreCollisions' parameter (which default to 'false')

Browse source
This commit is contained in:
Peter Simons 2014-02-24 12:41:12 +01:00
parent aa23a99436
commit 51c9dbc9f3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/interpreters/python/wrapper.nix
View file

@ -1,5 +1,5 @@
{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? "" { stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? ""
, stdLibs ? stdenv.lib.attrValues python.modules , stdLibs ? stdenv.lib.attrValues python.modules, ignoreCollisions ? false
}: }:
# Create a python executable that knows about additional packages. # Create a python executable that knows about additional packages.
@ -7,7 +7,8 @@
(buildEnv { (buildEnv {
name = "python-${python.version}-wrapper"; name = "python-${python.version}-wrapper";
paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ]; paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ];
ignoreCollisions = false;
inherit ignoreCollisions;
postBuild = '' postBuild = ''
. "${makeWrapper}/nix-support/setup-hook" . "${makeWrapper}/nix-support/setup-hook"