Merge pull request #210431 from Stunkymonkey/google-cloud-sdk-phases

google-cloud-sdk: deprecate phases
NixOS · Jan 22, 2023 · b21edaf · b21edaf
2 parents bee40cf + f400af6
commit b21edaf
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix
@@ -97,7 +97,7 @@ let
     in
     mkComponent
       {
-        name = component.id;
+        pname = component.id;
         version = component.version.version_string;
         src =
           if lib.hasAttrByPath [ "data" "source" ] component
@@ -120,7 +120,7 @@ let
 
   # Make a google-cloud-sdk component
   mkComponent =
-    { name
+    { pname
     , version
       # Source tarball, if any
     , src ? ""
@@ -135,15 +135,15 @@ let
       # The snapshot corresponding to this component
     , snapshot
     }: stdenv.mkDerivation {
-      inherit name version snapshot;
+      inherit pname version snapshot;
       src =
         if src != "" then
           builtins.fetchurl
             {
               url = src;
               inherit sha256;
             } else "";
-      phases = [ "installPhase" "fixupPhase" ];
+      dontUnpack = true;
       installPhase = ''
         mkdir -p $out/google-cloud-sdk/.install
 
@@ -159,7 +159,7 @@ let
         fi
 
         # Write the snapshot file to the `.install` folder
-        cp $snapshotPath $out/google-cloud-sdk/.install/${name}.snapshot.json
+        cp $snapshotPath $out/google-cloud-sdk/.install/${pname}.snapshot.json
       '';
       passthru = {
         dependencies = filterForSystem dependencies;