maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(buildGo): Update buildGo.proto for compatibility with external

Browse source 
Changes in the structure of buildGo.external meant that the package
layout for the protobuf library is now slightly different.

`proto` has been amended to work with the new structure. Callers of
buildGo.proto do not need to be updated (i.e. the example still
works).
This commit is contained in:
Vincent Ambo 2019-12-12 23:27:43 +00:00 • committed by Vincent Ambo
parent 875628a097
commit 0dfa5d15fa
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
buildGo.nix
View file

@ -76,8 +76,8 @@ let
# directory that follows the standard Go layout and was not built
# with buildGo.nix.
#
# The derivation for each actual dependency will reside in an
# attribute named "gopkg".
# The derivation for each actual package will reside in an attribute
# named "gopkg", and an attribute named "gobin" for binaries.
external = import ./external { inherit pkgs program package; };
# Import support libraries needed for protobuf & gRPC support
@ -88,10 +88,10 @@ let
# Build a Go library out of the specified protobuf definition.
proto = { name, proto, path ? name, extraDeps ? [] }: (makeOverridable package) {
inherit name path;
deps = [ protoLibs'.protobuf ] ++ extraDeps;
deps = [ protoLibs.goProto.proto.gopkg ] ++ extraDeps;
srcs = lib.singleton (runCommand "goproto-${name}.pb.go" {} ''
cp ${proto} ${baseNameOf proto}
${protobuf}/bin/protoc --plugin=${protoLibs.goProto}/bin/protoc-gen-go \
${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
'');