From c41ae569b81bcdd29306a9752bcb7afe9e1b0fad Mon Sep 17 00:00:00 2001
From: Matthieu <matthieu@developershouse.xyz>
Date: Tue, 7 Sep 2021 20:48:31 +0400
Subject: [PATCH] fix carious dependencies

---
 Cargo.lock                                   |  3 +++
 Cargo.toml                                   | 12 +++++++++++-
 cargo/BUILD.bazel                            | 10 +++++++++-
 cargo/crates.bzl                             |  1 +
 cargo/remote/BUILD.cpufeatures-0.2.1.bazel   |  3 +--
 cargo/remote/BUILD.libsodium-sys-0.2.7.bazel |  2 +-
 ratelimiter/build.rs                         |  2 --
 webhook/Cargo.toml                           |  3 ---
 8 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 18cd4de..977b315 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -571,6 +571,9 @@ dependencies = [
 [[package]]
 name = "nova"
 version = "0.1.0"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "ntapi"
diff --git a/Cargo.toml b/Cargo.toml
index f106640..d351a71 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,9 +15,19 @@ edition = "2018"
 name = "nova"
 path = "src/main.rs"
 
+[dependencies]
+libc = "0.2.101"
+
 [package.metadata.raze]
 workspace_path = "//cargo"
 genmode = "Remote"
 default_gen_buildrs = true
 package_aliases_dir = "cargo"
-experimental_api = true
\ No newline at end of file
+experimental_api = true
+
+[package.metadata.raze.crates.cpufeatures.'*']
+skipped_deps = ["libc-0.2.101"]
+additional_deps = ["@raze__libc__0_2_101//:libc"]
+
+[package.metadata.raze.crates.libsodium-sys.'*']
+buildrs_additional_environment_variables = { PATH = "/usr/sbin:/usr/bin:/sbin:/bin", "NUM_JOBS" = "2" }
diff --git a/cargo/BUILD.bazel b/cargo/BUILD.bazel
index 1613ea0..27b7961 100644
--- a/cargo/BUILD.bazel
+++ b/cargo/BUILD.bazel
@@ -11,7 +11,15 @@ licenses([
     "notice",  # See individual crates for specific licenses
 ])
 
-# No targets defined
+# Aliased targets
+alias(
+    name = "libc",
+    actual = "@raze__libc__0_2_101//:libc",
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+)
 
 # Export file for Stardoc support
 exports_files(
diff --git a/cargo/crates.bzl b/cargo/crates.bzl
index bb7afde..c773e0c 100644
--- a/cargo/crates.bzl
+++ b/cargo/crates.bzl
@@ -40,6 +40,7 @@ _DEPENDENCIES = {
         "url": "@raze__url__2_2_2//:url",
     },
     "": {
+        "libc": "@raze__libc__0_2_101//:libc",
     },
 }
 
diff --git a/cargo/remote/BUILD.cpufeatures-0.2.1.bazel b/cargo/remote/BUILD.cpufeatures-0.2.1.bazel
index 9d70700..676666d 100644
--- a/cargo/remote/BUILD.cpufeatures-0.2.1.bazel
+++ b/cargo/remote/BUILD.cpufeatures-0.2.1.bazel
@@ -51,12 +51,12 @@ rust_library(
     version = "0.2.1",
     # buildifier: leave-alone
     deps = [
+        "@raze__libc__0_2_101//:libc",
     ] + selects.with_or({
         # aarch64-apple-darwin
         (
             "@rules_rust//rust/platform:aarch64-apple-darwin",
         ): [
-            "@raze__libc__0_2_101//:libc",
         ],
         "//conditions:default": [],
     }) + selects.with_or({
@@ -64,7 +64,6 @@ rust_library(
         (
             "@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
         ): [
-            "@raze__libc__0_2_101//:libc",
         ],
         "//conditions:default": [],
     }),
diff --git a/cargo/remote/BUILD.libsodium-sys-0.2.7.bazel b/cargo/remote/BUILD.libsodium-sys-0.2.7.bazel
index f845dac..6c23c02 100644
--- a/cargo/remote/BUILD.libsodium-sys-0.2.7.bazel
+++ b/cargo/remote/BUILD.libsodium-sys-0.2.7.bazel
@@ -40,8 +40,8 @@ cargo_build_script(
     name = "libsodium_sys_build_script",
     srcs = glob(["**/*.rs"]),
     build_script_env = {
+        "NUM_JOBS": "2",
         "PATH": "/usr/sbin:/usr/bin:/sbin:/bin",
-        "NUM_JOBS": "2"
     },
     crate_features = [
     ],
diff --git a/ratelimiter/build.rs b/ratelimiter/build.rs
index ebafb2e..a1cee90 100644
--- a/ratelimiter/build.rs
+++ b/ratelimiter/build.rs
@@ -1,5 +1,3 @@
-use std::{fs, path::PathBuf};
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     tonic_build::compile_protos("proto/nova.ratelimit.v1.proto").unwrap();
     Ok(())
diff --git a/webhook/Cargo.toml b/webhook/Cargo.toml
index 9cdc681..0855804 100644
--- a/webhook/Cargo.toml
+++ b/webhook/Cargo.toml
@@ -16,6 +16,3 @@ pretty_env_logger = "0.4"
 [[bin]]
 name = "webhook"
 path = "src/main.rs"
-
-[package.metadata.raze.crates.libsodium-sys.'*']
-buildrs_additional_environment_variables = { PATH = "/usr/sbin:/usr/bin:/sbin:/bin" }
-- 
2.39.5