about summary refs log tree commit diff
path: root/nix/buildGo
diff options
context:
space:
mode:
authorKane York <kanepyork@gmail.com>2020-08-10T22·13-0700
committerkanepyork <rikingcoding@gmail.com>2020-08-20T03·05+0000
commitdfc351b4634aff4c56a08ab4f47139ccaf6dc652 (patch)
tree9f0c6e05461c86dab954b16befe78eb801f9d3b7 /nix/buildGo
parent50b200f21abec83e7d7934780526a3aae84ed0ef (diff)
feat(tools/depot-scanner): init project r/1683
depot-scanner is a tool that runs Nix and parses the --trace-file-access output to deduce what files are necessary to evaluate a derivation.

Take DEPOT_ROOT from the environment. If depotRoot doesn't exist, print an error early.

Fix the build of the protobuf library. Switch to the GRPC build rule, as a service is in this proto file.

Create the PathType enum and parse it from cmdline flags.

Change-Id: I537b5c6bceecf76ca510f7ac04ab9dad7785feb1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1769
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Diffstat (limited to 'nix/buildGo')
-rw-r--r--nix/buildGo/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nix/buildGo/default.nix b/nix/buildGo/default.nix
index 9999d1423e..a2396dc3f7 100644
--- a/nix/buildGo/default.nix
+++ b/nix/buildGo/default.nix
@@ -110,14 +110,14 @@ let
   };
 
   # Build a Go library out of the specified protobuf definition.
-  proto = { name, proto, path ? name, extraDeps ? [] }: (makeOverridable package) {
+  proto = { name, proto, path ? name, goPackage ? name, extraDeps ? [] }: (makeOverridable package) {
     inherit name path;
     deps = [ protoLibs.goProto.proto.gopkg ] ++ extraDeps;
     srcs = lib.singleton (runCommand "goproto-${name}.pb.go" {} ''
       cp ${proto} ${baseNameOf proto}
       ${protobuf}/bin/protoc --plugin=${protoLibs.goProto.protoc-gen-go.gopkg}/bin/protoc-gen-go \
         --go_out=plugins=grpc,import_path=${baseNameOf path}:. ${baseNameOf proto}
-      mv *.pb.go $out
+      mv ./${goPackage}/*.pb.go $out
     '');
   };