Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/infra/client/isolate-v8-runner/src/isolate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use nix::{libc, unistd::pipe};
use tokio::{fs, sync::watch};
use uuid::Uuid;

use crate::{config::Config, utils, log_shipper};
use crate::{config::Config, log_shipper, utils};

pub fn run(actors_path: PathBuf, actor_id: Uuid, stop_rx: watch::Receiver<()>) -> Result<()> {
let actor_path = actors_path.join(actor_id.to_string());
Expand Down
2 changes: 1 addition & 1 deletion packages/infra/client/manager/tests/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ use std::{
convert::Infallible,
net::SocketAddr,
path::{Path, PathBuf},
time::Duration,
sync::{
atomic::{AtomicBool, Ordering},
Arc, Once,
},
time::Duration,
};

use anyhow::Context;
Expand Down
16 changes: 13 additions & 3 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ let
pkgs = import (fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/23.05.tar.gz";
}) { overlays = [ moz_overlay ]; };

foundationDbShellHook = ''
# Set LIBCLANG_PATH to point directly to the library
export LIBCLANG_PATH="${pkgs.llvmPackages.libclang.lib}/lib"
'';
in
pkgs.mkShell {
name = "rivet";
Expand Down Expand Up @@ -40,10 +45,13 @@ in
# Utilities
netcat

# FoundationDB
llvmPackages.libclang
fdbPackages.foundationdb71

# Fixes "cannot change locale" warning
glibcLocales
]
++ extraInputs
++ (
pkgs.lib.optionals stdenv.isDarwin [
libiconv # See https://stackoverflow.com/a/69732679
Expand All @@ -60,12 +68,14 @@ in
# Install autocomplete
source ${pkgs.bash-completion}/share/bash-completion/bash_completion

# Fix dynamic library path to fix issue with Python
export LD_LIBRARY_PATH="${pkgs.clang}/resource-root/lib:${pkgs.lib.strings.makeLibraryPath [ pkgs.openssl ]}"
# Fix dynamic library path to fix issue with Python and FoundationDB
export LD_LIBRARY_PATH="${pkgs.clang}/resource-root/lib:${pkgs.lib.strings.makeLibraryPath [ pkgs.openssl ]}:${pkgs.lib.strings.makeLibraryPath [ pkgs.fdbPackages.foundationdb71 ]}"

# Set default Rust flags to match the Rust flags used inside of Bolt.
#
# If these don't match, then the build cache is purged any time Rust is ran from Bolt.
export RUSTFLAGS="--cfg tokio_unstable"

${foundationDbShellHook}
'';
}