From b1a6442c24e2293cb301d9247a637da3081e2b60 Mon Sep 17 00:00:00 2001
From: Stefan Lau <github@stefanlau.com>
Date: Sun, 21 May 2017 13:54:33 +0200
Subject: [PATCH] google-cloud-sdk: Fix calls to itself

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 0dda60ced337..b66c4c041f71 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -37,10 +37,13 @@ stdenv.mkDerivation rec {
     # create wrappers with correct env
     for program in gcloud bq gsutil git-credential-gcloud.sh; do
         programPath="$out/google-cloud-sdk/bin/$program"
-        wrapper="$out/bin/$program"
-        makeWrapper "$programPath" "$wrapper" \
+        binaryPath="$out/bin/$program"
+        wrapProgram "$programPath" \
             --set CLOUDSDK_PYTHON "${python27}/bin/python" \
             --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl}):$(toPythonPath ${crcmod})"
+
+        mkdir -p $out/bin
+        ln -s $programPath $binaryPath
     done
 
     # install man pages