From a9fb3ea0e746226a8bed539854f44ba87df03909 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 27 Jul 2022 09:46:29 +1000 Subject: [PATCH] buildGoModule: move setup-hook to gotools the hook is for gotools, doesn't need to live with buildGoModule - also remove duplicate buildGoPackage hook --- pkgs/development/go-packages/tools/setup-hook.sh | 1 - pkgs/development/tools/gotools/default.nix | 2 +- .../{go-modules/tools => tools/gotools}/setup-hook.sh | 0 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 pkgs/development/go-packages/tools/setup-hook.sh rename pkgs/development/{go-modules/tools => tools/gotools}/setup-hook.sh (100%) diff --git a/pkgs/development/go-packages/tools/setup-hook.sh b/pkgs/development/go-packages/tools/setup-hook.sh deleted file mode 100644 index e354e50c35aa..000000000000 --- a/pkgs/development/go-packages/tools/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export GOTOOLDIR=@bin@/bin diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 9ea238233c36..eaa521f7a17a 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -43,7 +43,7 @@ buildGoModule rec { # Set GOTOOLDIR for derivations adding this to buildInputs postInstall = '' mkdir -p $out/nix-support - substitute ${../../go-modules/tools/setup-hook.sh} $out/nix-support/setup-hook \ + substitute ${./setup-hook.sh} $out/nix-support/setup-hook \ --subst-var-by bin $out ''; diff --git a/pkgs/development/go-modules/tools/setup-hook.sh b/pkgs/development/tools/gotools/setup-hook.sh similarity index 100% rename from pkgs/development/go-modules/tools/setup-hook.sh rename to pkgs/development/tools/gotools/setup-hook.sh