google-cloud-sdk: include openssl(1) in PATH (#77277)

Otherwise, it might fail with a mysterious error:

    ERROR: (gcloud.beta.compute.reset-windows-password) Your platform does not support OpenSSL.
This commit is contained in:
edef 2020-01-10 09:42:37 +00:00 committed by zimbatm
parent 773494d0ea
commit 178ac3cb99

View File

@ -7,7 +7,7 @@
# 3) used by `google-cloud-sdk` only on GCE guests # 3) used by `google-cloud-sdk` only on GCE guests
# #
{ stdenv, lib, fetchurl, makeWrapper, python, with-gce ? false }: { stdenv, lib, fetchurl, makeWrapper, python, openssl, with-gce ? false }:
let let
pythonEnv = python.withPackages (p: with p; [ pythonEnv = python.withPackages (p: with p; [
@ -56,7 +56,8 @@ in stdenv.mkDerivation rec {
binaryPath="$out/bin/$program" binaryPath="$out/bin/$program"
wrapProgram "$programPath" \ wrapProgram "$programPath" \
--set CLOUDSDK_PYTHON "${pythonEnv}/bin/python" \ --set CLOUDSDK_PYTHON "${pythonEnv}/bin/python" \
--prefix PYTHONPATH : "${pythonEnv}/${python.sitePackages}" --prefix PYTHONPATH : "${pythonEnv}/${python.sitePackages}" \
--prefix PATH : "${openssl.bin}/bin"
mkdir -p $out/bin mkdir -p $out/bin
ln -s $programPath $binaryPath ln -s $programPath $binaryPath