|
|
|
@ -40,10 +40,10 @@ let |
|
|
|
|
"x86_64-windows" = newBuildTarget { |
|
|
|
|
nixPkgsSystem = "x86_64-w64-mingw32"; |
|
|
|
|
rustTarget = "x86_64-pc-windows-gnu"; |
|
|
|
|
depsBuildBuild = pkgsCross: [ |
|
|
|
|
pkgsCross.stdenv.cc |
|
|
|
|
pkgsCross.windows.pthreads |
|
|
|
|
]; |
|
|
|
|
#depsBuildBuild = pkgsCross: [ |
|
|
|
|
# pkgsCross.stdenv.cc |
|
|
|
|
# pkgsCross.windows.pthreads |
|
|
|
|
#]; |
|
|
|
|
}; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
@ -123,7 +123,6 @@ let |
|
|
|
|
"garage/kubernetes-discovery" |
|
|
|
|
"garage/metrics" |
|
|
|
|
"garage/telemetry-otlp" |
|
|
|
|
"garage/lmdb" |
|
|
|
|
"garage/sqlite" |
|
|
|
|
] else [ ] |
|
|
|
|
) |
|
|
|
@ -147,6 +146,8 @@ let |
|
|
|
|
nativeBuildInputs = (buildTarget.depsBuildBuild pkgsCross) ++ [ |
|
|
|
|
toolchain |
|
|
|
|
pkgs.protobuf |
|
|
|
|
#pkgsCross.stdenv.cc |
|
|
|
|
#pkgsCross.windows.pthreads |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
buildInputs = [ |
|
|
|
@ -154,10 +155,6 @@ let |
|
|
|
|
pkgsCross.windows.pthreads |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
OPENSSL_STATIC = "1"; |
|
|
|
|
OPENSSL_LIB_DIR = "${pkgsCross.pkgsStatic.openssl.out}/lib"; |
|
|
|
|
OPENSSL_INCLUDE_DIR = "${pkgsCross.pkgsStatic.openssl.dev}/include"; |
|
|
|
|
|
|
|
|
|
SODIUM_LIB_DIR = "${libsodium}/lib"; |
|
|
|
|
|
|
|
|
|
# Required because ring crate is special. This also seems to have |
|
|
|
|