diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-26 19:21:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-26 19:21:37 -0500 |
| commit | 4a2621da53705b602bcdd8460157517f23d14cff (patch) | |
| tree | d8d2f154fcc7b6370e5f69757437b1a79631db95 /pkgs/development/interpreters/python | |
| parent | 42b5c7e994c827b90e1a5432314e9c7513c99926 (diff) | |
| parent | b0633406cb70e0e4ae3470a6b49e32b38d99ac16 (diff) | |
| download | nixlib-4a2621da53705b602bcdd8460157517f23d14cff.tar nixlib-4a2621da53705b602bcdd8460157517f23d14cff.tar.gz nixlib-4a2621da53705b602bcdd8460157517f23d14cff.tar.bz2 nixlib-4a2621da53705b602bcdd8460157517f23d14cff.tar.lz nixlib-4a2621da53705b602bcdd8460157517f23d14cff.tar.xz nixlib-4a2621da53705b602bcdd8460157517f23d14cff.tar.zst nixlib-4a2621da53705b602bcdd8460157517f23d14cff.zip | |
Merge pull request #76283 from jtojnar/python-mwa
python.pkgs.wrapPython: fix makeWrapperArgs
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/wrap.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index c7201c7a997b..6beb55f055b5 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -81,7 +81,16 @@ wrapPythonProgramsIn() { # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. - local -a user_args="($makeWrapperArgs)" + local -a user_args + # We need to support both the case when makeWrapperArgs + # is an array and a IFS-separated string. + # TODO: remove the string branch when __structuredAttrs are used. + if [[ "$(declare -p makeWrapperArgs)" =~ ^'declare -a makeWrapperArgs=' ]]; then + user_args=("${makeWrapperArgs[@]}") + else + user_args="($makeWrapperArgs)" + fi + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") wrapProgram "${wrapProgramArgs[@]}" fi |