Skip to content

Commit

Permalink
fix(notifications): use nix protoc instead of buckified
Browse files Browse the repository at this point in the history
  • Loading branch information
bodymindarts committed Jan 16, 2024
1 parent 5b1358b commit f9fe25e
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 304 deletions.
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
nativeBuildInputs = with pkgs;
[
envsubst
unzip
nodejs
tilt
typescript
Expand Down
18 changes: 0 additions & 18 deletions third-party/proto/BUCK

This file was deleted.

104 changes: 0 additions & 104 deletions third-party/proto/defs.bzl

This file was deleted.

46 changes: 0 additions & 46 deletions third-party/proto/releases.bzl

This file was deleted.

99 changes: 0 additions & 99 deletions third-party/proto/update.py

This file was deleted.

18 changes: 8 additions & 10 deletions toolchains/rust/macros.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -114,19 +114,17 @@ def galoy_rust_lib(
)

build_env = build_env or {}
build_env.update(
{
"PROTOC": "$(exe //third-party/proto:protoc)",
"PROTOC_INCLUDE": "$(location //third-party/proto:google_protobuf)",
},
)

# When using protoc included via buck:
# build_env.update(
# {
# "PROTOC": "$(exe //third-party/proto:protoc)",
# "PROTOC_INCLUDE": "$(location //third-party/proto:google_protobuf)",
# },
# )

native.genrule(
name = proto_name,
srcs = protos + [
"//third-party/proto:google_protobuf",
],
srcs = protos,
out = ".",
cmd = "$(exe :" + build_name + ")",
env = build_env,
Expand Down
8 changes: 0 additions & 8 deletions vendir.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,4 @@ directories:
- 2023-10-15-425-gf3c685667
path: .
path: third-party/rust/fixups/ring/include
- contents:
- git:
commitTitle: 'client: Fix "ctrl-c was pressed" bug...'
sha: f3c685667ef22d0130687003012b6960abec6b3b
tags:
- 2023-10-15-425-gf3c685667
path: .
path: third-party/proto
kind: LockConfig
9 changes: 0 additions & 9 deletions vendir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,3 @@ directories:
includePaths:
- shim/third-party/rust/fixups/ring/include/**/*
newRootPath: shim/third-party/rust/fixups/ring/include
- path: third-party/proto
contents:
- path: .
git:
url: https://github.com/facebook/buck2.git
ref: f3c685667ef22d0130687003012b6960abec6b3b
includePaths:
- shim/third-party/proto/**/*
newRootPath: shim/third-party/proto
9 changes: 0 additions & 9 deletions vendir/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,3 @@ directories:
includePaths:
- shim/third-party/rust/fixups/ring/include/**/*
newRootPath: shim/third-party/rust/fixups/ring/include
- path: third-party/proto
contents:
- path: .
git:
url: https://github.com/facebook/buck2.git
ref: #@ data.values.ring_fixup_git_ref
includePaths:
- shim/third-party/proto/**/*
newRootPath: shim/third-party/proto

0 comments on commit f9fe25e

Please sign in to comment.