Skip to content

Commit

Permalink
update libs
Browse files Browse the repository at this point in the history
  • Loading branch information
levydsa committed Jan 9, 2025
1 parent a1c6cc6 commit 13b6451
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 61 deletions.
106 changes: 53 additions & 53 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
};
toUpper = pkgs.lib.strings.toUpper;
rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
craneLib = pkgs.lib.debug.traveVal ((crane.mkLib pkgs).overrideToolchain rust);
craneLib = (crane.mkLib pkgs).overrideToolchain rust;
cargofy = s: builtins.replaceStrings [ "-" ] [ "_" ] s;
env = config: cc: {
nativeBuildInputs = [ cc ];
Expand Down
6 changes: 1 addition & 5 deletions package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,8 @@ craneLib.buildPackage {
"CARGO_TARGET_${target}_LINKER" = "${stdenv.cc.targetPrefix}cc";

RUSTFLAGS = "-C target-feature=-crt-static";
cargoExtraArgs = "--features encryption";

HOST_CC = "${stdenv.cc.nativePrefix}cc";
TARGET_CC = "${stdenv.cc.targetPrefix}cc";

BINDGEN_EXTRA_CLANG_ARGS =
if stdenv.isDarwin
then "-isystem ${apple-sdk.sdkroot}/usr/include"
else "-isystem ${stdenv.cc.libc.dev}/include";
}
2 changes: 0 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1125,8 +1125,6 @@ mod tests {
dbg!(unsafe { CStr::from_ptr(log.message) });
}

tracing::error!("we are fucked");

let setup = libsql_setup(libsql_config_t {
version: version.as_ptr(),
logger: Some(callback),
Expand Down

0 comments on commit 13b6451

Please sign in to comment.