diff --git a/flake.nix b/flake.nix index b87ca74..18dec74 100644 --- a/flake.nix +++ b/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; diff --git a/pkgs/gcloud-wrapped/default.nix b/pkgs/gcloud-wrapped/default.nix new file mode 100644 index 0000000..5a5a10c --- /dev/null +++ b/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 + ''; +} diff --git a/pkgs/gcloud-wrapper/go.mod b/pkgs/gcloud-wrapped/go.mod similarity index 100% rename from pkgs/gcloud-wrapper/go.mod rename to pkgs/gcloud-wrapped/go.mod diff --git a/pkgs/gcloud-wrapper/main.go b/pkgs/gcloud-wrapped/main.go similarity index 100% rename from pkgs/gcloud-wrapper/main.go rename to pkgs/gcloud-wrapped/main.go diff --git a/pkgs/gcloud-wrapper/default.nix b/pkgs/gcloud-wrapper/default.nix deleted file mode 100644 index 67f727c..0000000 --- a/pkgs/gcloud-wrapper/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ buildGoModule }: -buildGoModule { - name = "gcloud-wrapper"; - src = ./.; - vendorHash = null; -} diff --git a/shared/work/default.nix b/shared/work/default.nix index 5d5d513..e5c9307 100644 --- a/shared/work/default.nix +++ b/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;