micropelago/garage
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed nix shell for local build

Browse Source
This commit is contained in:
Brian Picciano 2023-12-10 15:00:43 +01:00
parent 7008e1653b
commit f6b1f1fc23
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
default.nix
View File

@ -150,11 +150,6 @@ let
#pkgsCross.windows.pthreads #pkgsCross.windows.pthreads
]; ];
buildInputs = [
pkgsCross.stdenv.cc
pkgsCross.windows.pthreads
];
SODIUM_LIB_DIR = "${libsodium}/lib"; SODIUM_LIB_DIR = "${libsodium}/lib";
# Required because ring crate is special. This also seems to have # Required because ring crate is special. This also seems to have
@ -164,10 +159,7 @@ let
CARGO_BUILD_TARGET = rustTarget; CARGO_BUILD_TARGET = rustTarget;
CARGO_BUILD_RUSTFLAGS = [ CARGO_BUILD_RUSTFLAGS = [
"-C" "target-feature=+crt-static" "-C" "target-feature=+crt-static"
"-C" "link-args=-static"
# -latomic is required to build openssl-sys for armv6l-linux, but
# it doesn't seem to hurt any other builds.
"-C" "link-args=-static -latomic"
# https://github.com/rust-lang/cargo/issues/4133 # https://github.com/rust-lang/cargo/issues/4133
"-C" "linker=${TARGET_CC}" "-C" "linker=${TARGET_CC}"
@ -190,7 +182,7 @@ in {
]; ];
} // buildEnv); } // buildEnv);
shell = pkgsCross.mkShell buildEnv; shell = pkgs.mkShell buildEnv;
# TODO # TODO
#clippy = { #clippy = {