about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorStefan Lau <github@stefanlau.com>2017-05-21 13:54:33 +0200
committerStefan Lau <github@stefanlau.com>2017-05-21 13:54:33 +0200
commitb1a6442c24e2293cb301d9247a637da3081e2b60 (patch)
tree97e4c8c8783692e98ffa5d82d144a1a8a788871b /pkgs/tools
parentb6fabe24fd70917034180ed8c9c2f915c7485caa (diff)
downloadnixlib-b1a6442c24e2293cb301d9247a637da3081e2b60.tar
nixlib-b1a6442c24e2293cb301d9247a637da3081e2b60.tar.gz
nixlib-b1a6442c24e2293cb301d9247a637da3081e2b60.tar.bz2
nixlib-b1a6442c24e2293cb301d9247a637da3081e2b60.tar.lz
nixlib-b1a6442c24e2293cb301d9247a637da3081e2b60.tar.xz
nixlib-b1a6442c24e2293cb301d9247a637da3081e2b60.tar.zst
nixlib-b1a6442c24e2293cb301d9247a637da3081e2b60.zip
google-cloud-sdk: Fix calls to itself
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/admin/google-cloud-sdk/default.nix7
1 files 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