about summary refs log tree commit diff
path: root/pkgs/tools/admin
diff options
context:
space:
mode:
authorNick Novitski <github@nicknovitski.com>2023-11-15 02:27:27 -0800
committerGitHub <noreply@github.com>2023-11-15 11:27:27 +0100
commit68baab123fc4f898ebb6191eca8ae9383604f5f5 (patch)
tree4802619546a1684d125612c11a9b1f52ddca665d /pkgs/tools/admin
parent229ee1db6623dc78e68bb5caf9be9a09f72c1513 (diff)
google-cloud-sdk: remove original package from extra-components closures (#266579)
This is a difference of ~444 megabytes.
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r--pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix
index c71f23c978bbf..b65b5700c6070 100644
--- a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix
@@ -32,6 +32,7 @@ runCommand "google-cloud-sdk-${google-cloud-sdk.version}"
   passAsFile = [ "comps" ];
 
   doInstallCheck = true;
+  disallowedRequisites = [ google-cloud-sdk ];
   installCheckPhase =
     let
       compNames = builtins.map (drv: drv.name) comps_;
@@ -57,5 +58,5 @@ runCommand "google-cloud-sdk-${google-cloud-sdk.version}"
     done
 
     # Replace references to the original google-cloud-sdk with this one
-    find $out/google-cloud-sdk/bin/ -type f -exec sed -i -e "s#${google-cloud-sdk}#$out#" {} \;
+    find $out/google-cloud-sdk -type f -exec sed -i -e "s#${google-cloud-sdk}#$out#" {} \;
   ''