From 51c9dbc9f3ad4cf3142d0e50b040f4ba14b84ad2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 12:41:12 +0100
Subject: [PATCH] python-wrapper: add 'ignoreCollisions' parameter (which
 default to 'false')

---
 pkgs/development/interpreters/python/wrapper.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 34af23740d5..ccfbcfcdd42 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -1,5 +1,5 @@
 { 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.
@@ -7,7 +7,8 @@
 (buildEnv {
   name = "python-${python.version}-wrapper";
   paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ];
-  ignoreCollisions = false;
+
+  inherit ignoreCollisions;
 
   postBuild = ''
     . "${makeWrapper}/nix-support/setup-hook"