Merge pull request #12521 from zopa/master

google-cloud-sdk: Add various modules to python path
This commit is contained in:
Joachim Fasting 2016-04-22 22:35:59 +02:00
commit 0f9058365a

View File

@ -1,5 +1,7 @@
{stdenv, fetchurl, python27, python27Packages, makeWrapper}: {stdenv, fetchurl, python27, python27Packages, makeWrapper}:
with python27Packages;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "106.0.0"; version = "106.0.0";
name = "google-cloud-sdk-${version}"; name = "google-cloud-sdk-${version}";
@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
wrapper="$out/bin/$program" wrapper="$out/bin/$program"
makeWrapper "$programPath" "$wrapper" \ makeWrapper "$programPath" "$wrapper" \
--set CLOUDSDK_PYTHON "${python27}/bin/python" \ --set CLOUDSDK_PYTHON "${python27}/bin/python" \
--prefix PYTHONPATH : "$(toPythonPath ${python27Packages.crcmod})" --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl}):$(toPythonPath ${crcmod})"
done done
# install man pages # install man pages