|
|
|
@ -150,11 +150,6 @@ let |
|
|
|
|
#pkgsCross.windows.pthreads |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
buildInputs = [ |
|
|
|
|
pkgsCross.stdenv.cc |
|
|
|
|
pkgsCross.windows.pthreads |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
SODIUM_LIB_DIR = "${libsodium}/lib"; |
|
|
|
|
|
|
|
|
|
# Required because ring crate is special. This also seems to have |
|
|
|
@ -164,10 +159,7 @@ let |
|
|
|
|
CARGO_BUILD_TARGET = rustTarget; |
|
|
|
|
CARGO_BUILD_RUSTFLAGS = [ |
|
|
|
|
"-C" "target-feature=+crt-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" |
|
|
|
|
"-C" "link-args=-static" |
|
|
|
|
|
|
|
|
|
# https://github.com/rust-lang/cargo/issues/4133 |
|
|
|
|
"-C" "linker=${TARGET_CC}" |
|
|
|
@ -190,7 +182,7 @@ in { |
|
|
|
|
]; |
|
|
|
|
} // buildEnv); |
|
|
|
|
|
|
|
|
|
shell = pkgsCross.mkShell buildEnv; |
|
|
|
|
shell = pkgs.mkShell buildEnv; |
|
|
|
|
|
|
|
|
|
# TODO |
|
|
|
|
#clippy = { |
|
|
|
|