summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authoredef <edef@edef.eu>2020-01-10 09:42:37 +0000
committerzimbatm <zimbatm@zimbatm.com>2020-01-10 09:42:37 +0000
commit178ac3cb99a2af4e39fa287ce4774ebb608eef1a (patch)
treea01f68fd21e25243d52c3974ab14499b0b8815ad /pkgs/tools
parent773494d0ea6fdf3a40561b44b805b90ae1949292 (diff)
downloadnixpkgs-178ac3cb99a2af4e39fa287ce4774ebb608eef1a.tar
nixpkgs-178ac3cb99a2af4e39fa287ce4774ebb608eef1a.tar.gz
nixpkgs-178ac3cb99a2af4e39fa287ce4774ebb608eef1a.tar.bz2
nixpkgs-178ac3cb99a2af4e39fa287ce4774ebb608eef1a.tar.lz
nixpkgs-178ac3cb99a2af4e39fa287ce4774ebb608eef1a.tar.xz
nixpkgs-178ac3cb99a2af4e39fa287ce4774ebb608eef1a.tar.zst
nixpkgs-178ac3cb99a2af4e39fa287ce4774ebb608eef1a.zip
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.
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/admin/google-cloud-sdk/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 5e02c8e3483..5bcc25ea989 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -7,7 +7,7 @@
 #   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
   pythonEnv = python.withPackages (p: with p; [
@@ -56,7 +56,8 @@ in stdenv.mkDerivation rec {
         binaryPath="$out/bin/$program"
         wrapProgram "$programPath" \
             --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
         ln -s $programPath $binaryPath