summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/admin
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2019-06-12 17:34:17 +0200
committerFlorian Klink <flokli@flokli.de>2019-06-14 23:41:38 +0200
commitff647cab19dce77f7433ec7919424ff68b80de9b (patch)
tree45316ff49e31751d0a1b1806a8ee6c75eb649a71 /pkgs/tools/admin
parentc8dedaddd64f8c9ec657c97ae218136df962e837 (diff)
google-cloud-sdk: use doBuild = false instead of hardcoding phases
We don't want to unpack in installPhase either.
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r--pkgs/tools/admin/google-cloud-sdk/default.nix15
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 3abd189d0f97..9099bfb242f4 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -36,16 +36,15 @@ in stdenv.mkDerivation rec {
buildInputs = [ python makeWrapper ];
- phases = [ "installPhase" "fixupPhase" ];
+ doBuild = false;
+
installPhase = ''
- mkdir -p "$out"
- tar -xzf "$src" -C "$out" google-cloud-sdk
+ mkdir -p $out/google-cloud-sdk
+ cp -R * .install $out/google-cloud-sdk/
- mkdir $out/google-cloud-sdk/lib/surface/alpha
+ mkdir -p $out/google-cloud-sdk/lib/surface/{alpha,beta}
cp ${./alpha__init__.py} $out/google-cloud-sdk/lib/surface/alpha/__init__.py
-
- mkdir $out/google-cloud-sdk/lib/surface/beta
cp ${./beta__init__.py} $out/google-cloud-sdk/lib/surface/beta/__init__.py
# create wrappers with correct env
@@ -68,8 +67,8 @@ in stdenv.mkDerivation rec {
disable_update_check = true" >> $out/google-cloud-sdk/properties
# setup bash completion
- mkdir -p "$out/etc/bash_completion.d/"
- mv "$out/google-cloud-sdk/completion.bash.inc" "$out/etc/bash_completion.d/gcloud.inc"
+ mkdir -p $out/etc/bash_completion.d
+ mv $out/google-cloud-sdk/completion.bash.inc $out/etc/bash_completion.d/gcloud.inc
# This directory contains compiled mac binaries. We used crcmod from
# nixpkgs instead.