gcloud: move package hacks ot its own module

flake.nix

@@ -106,7 +106,7 @@
           tmuxbash = super.callPackage ./pkgs/tmuxbash.nix { };
           vanta-agent = super.callPackage ./pkgs/vanta-agent.nix { };
           chronoctl = super.callPackage ./pkgs/chronoctl.nix { };
-          gcloud-wrapper = super.callPackage ./pkgs/gcloud-wrapper { };
+          gcloud-wrapped = super.callPackage ./pkgs/gcloud-wrapped { };
 
           pkgs-unstable = import nixpkgs-unstable {
             inherit (super) system;

pkgs/gcloud-wrapped/default.nix

@@ -0,0 +1,23 @@
+{ buildGoModule, pkgs }:
+let
+  gcloud-wrapper = buildGoModule {
+    name = "gcloud-wrapper";
+    src = ./.;
+    vendorHash = null;
+  };
+in
+pkgs.symlinkJoin {
+  name = "google-cloud-sdk-wrapped";
+  paths = [ pkgs.google-cloud-sdk ];
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+  postBuild = ''
+    # Remove the original gcloud symlink
+    rm $out/bin/gcloud
+
+    # Create a shell wrapper called gcloud-wrapped that executes the real gcloud
+    makeWrapper ${pkgs.google-cloud-sdk}/bin/gcloud $out/bin/gcloud-wrapped
+
+    # Replace gcloud with our caching wrapper
+    ln -s ${gcloud-wrapper}/bin/gcloud-wrapper $out/bin/gcloud
+  '';
+}

pkgs/gcloud-wrapper/default.nix

@@ -1,6 +0,0 @@
-{ buildGoModule }:
-buildGoModule {
-  name = "gcloud-wrapper";
-  src = ./.;
-  vendorHash = null;
-}

shared/work/default.nix

@@ -1,21 +1,4 @@
 { config, pkgs, ... }:
-let
-  gcloud-wrapped = pkgs.symlinkJoin {
-    name = "google-cloud-sdk-wrapped";
-    paths = [ pkgs.google-cloud-sdk ];
-    nativeBuildInputs = [ pkgs.makeWrapper ];
-    postBuild = ''
-      # Remove the original gcloud symlink
-      rm $out/bin/gcloud
-
-      # Create a shell wrapper called gcloud-wrapped that executes the real gcloud
-      makeWrapper ${pkgs.google-cloud-sdk}/bin/gcloud $out/bin/gcloud-wrapped
-
-      # Replace gcloud with our caching wrapper
-      ln -s ${pkgs.gcloud-wrapper}/bin/gcloud-wrapper $out/bin/gcloud
-    '';
-  };
-in
 {
   mj.base.users.email = null;