fix build data in the api (#560)

* fix build data in the Api * Update lock files
tangle-network · Jul 12, 2023 · a439e42 · a439e42
1 parent e2d74da
commit a439e42
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 50 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.5.5-dev"
+version = "0.5.6-dev"
 authors = ["Webb Developers <drew@webb.tools>"]
 license = "Apache-2.0"
 documentation = "https://docs.rs/webb-relayer"

diff --git a/crates/relayer-handlers/Cargo.toml b/crates/relayer-handlers/Cargo.toml
@@ -34,3 +34,5 @@ axum = { workspace = true }
 axum-client-ip = "0.4.0"
 tokio-stream = { version = "^0.1" }
 
+[build-dependencies]
+build-data = "0.1.4"
diff --git a/services/webb-relayer/build.rs → crates/relayer-handlers/build.rs b/services/webb-relayer/build.rs → crates/relayer-handlers/build.rs
diff --git a/crates/relayer-handlers/src/routes/info.rs b/crates/relayer-handlers/src/routes/info.rs
@@ -80,9 +80,9 @@ pub async fn handle_relayer_info(
 
     // Build info
     let build_info = BuildInfo {
-        version: std::env::var("CARGO_PKG_VERSION").unwrap_or_default(),
-        commit: std::env::var("GIT_COMMIT").unwrap_or_default(),
-        timestamp: std::env::var("SOURCE_TIMESTAMP").unwrap_or_default(),
+        version: env!("CARGO_PKG_VERSION").into(),
+        commit: env!("GIT_COMMIT").into(),
+        timestamp: env!("SOURCE_TIMESTAMP").into(),
     };
     let relayer_config = RelayerConfig {
         config,

diff --git a/flake.nix b/flake.nix
@@ -31,6 +31,7 @@
             pkgs.clang
             # Mold Linker for faster builds (only on Linux)
             (lib.optionals pkgs.stdenv.isLinux pkgs.mold)
+            (lib.optionals pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security)
           ];
           buildInputs = [
             # Used for DVC
@@ -53,7 +54,7 @@
           # Environment variables
           RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library";
           # Needed for running DKG/Tangle locally
-          LD_LIBRARY_PATH = "${pkgs.gmp}/lib";
+          LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.gmp ];
         };
       });
 }
diff --git a/services/webb-relayer/Cargo.toml b/services/webb-relayer/Cargo.toml
@@ -10,9 +10,6 @@ documentation = { workspace = true }
 homepage = { workspace = true }
 repository = { workspace = true }
 
-[build-dependencies]
-build-data = "0.1.4"
-
 [lib]
 doctest = false