From 6bb2e47abf8317364c86d84808a04a72e40ff1f0 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Sun, 24 May 2015 10:19:13 -0500
Subject: [PATCH] using makeWrapperArgs instead of setEnvVars

---
 pkgs/development/python-modules/generic/default.nix | 6 +++---
 pkgs/development/python-modules/generic/wrap.sh     | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 9856682ba89..378f047939f 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -47,9 +47,9 @@
 # Execute after shell hook
 , postShellHook ? ""
 
-# Environment variables to set in wrapper scripts, in addition to
-# PYTHONPATH and PATH.
-, setEnvVars ? []
+# Additional arguments to pass to the makeWrapper function, which wraps
+# generated binaries.
+, makeWrapperArgs ? []
 
 , ... } @ attrs:
 
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index f9a65c6a33f..33b9a06f608 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -45,11 +45,10 @@ wrapPythonProgramsIn() {
                                  --prefix PYTHONPATH ':' $program_PYTHONPATH \
                                  --prefix PATH ':' $program_PATH"
 
-                # Add any additional environment variables to propagate.
-                for env_var in $setEnvVars; do
-                    # Look up the value of this variable
-                    local value=$(eval "echo \$$env_var")
-                    wrap_args="$wrap_args --set $env_var $value"
+                # Add any additional arguments provided by makeWrapperArgs
+                # argument to buildPythonPackage.
+                for arg in $makeWrapperArgs; do
+                    wrap_args="$wrap_args $arg"
                 done
                 wrapProgram $wrap_args
             fi