diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-26 22:39:25 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-26 22:39:25 +0000 |
| commit | bd2ad77e38991af0d7a3a5d82bd3f41a077ce401 (patch) | |
| tree | d1e26d039eb5004eb7c836aafff259cc198626d4 /pkgs/tools/admin/google-cloud-sdk/default.nix | |
| parent | e5d8381542a8d084371d26013fab199f52474be7 (diff) | |
| parent | ad3f0d9829119b611350a9be1c226fb625f1f310 (diff) | |
| download | nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.gz nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.bz2 nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.lz nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.xz nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.zst nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/tools/admin/google-cloud-sdk/default.nix')
| -rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/default.nix | 5 |
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 |