Unverified Commit 1f27e245 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #307921 from marcusramberg/marcus/gsdk

google-cloud-sdk: Fix build warnings
parents 70617b09 6ce4620d
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ in stdenv.mkDerivation rec {

    # disable component updater and update check
    substituteInPlace $out/google-cloud-sdk/lib/googlecloudsdk/core/config.json \
      --replace "\"disable_updater\": false" "\"disable_updater\": true"
      --replace-fail "\"disable_updater\": false" "\"disable_updater\": true"
    echo "
    [component_manager]
    disable_update_check = true" >> $out/google-cloud-sdk/properties
@@ -110,6 +110,8 @@ in stdenv.mkDerivation rec {

  doInstallCheck = true;
  installCheckPhase = ''
    # Avoid trying to write logs to homeless-shelter
    export HOME=$(mktemp -d)
    $out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"
  '';

@@ -129,7 +131,7 @@ in stdenv.mkDerivation rec {
    license = licenses.free;
    homepage = "https://cloud.google.com/sdk/";
    changelog = "https://cloud.google.com/sdk/docs/release-notes";
    maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ];
    maintainers = with maintainers; [ iammrinal0 marcusramberg pradyuman stephenmw zimbatm ];
    platforms = builtins.attrNames data.googleCloudSdkPkgs;
    mainProgram = "gcloud";
  };