mirror of
https://github.com/chatmail/core.git
synced 2026-04-27 18:36:30 +03:00
build: do not vendor OpenSSL when cross-compiling (#5316)
Compilation of vendored OpenSSL inside Nix is broken since <https://github.com/alexcrichton/openssl-src-rs/pull/229> due to build script changes. There is anyway no need to compile vendored OpenSSL as nixpkgs already contains OpenSSL package. This fixes `nix build .#deltachat-rpc-server-x86_64-linux` and similar commands which are used during releases.
This commit is contained in:
@@ -165,9 +165,6 @@
|
||||
version = manifest.version;
|
||||
strictDeps = true;
|
||||
src = pkgs.lib.cleanSource ./.;
|
||||
nativeBuildInputs = [
|
||||
pkgs.perl # Needed to build vendored OpenSSL.
|
||||
];
|
||||
auditable = false; # Avoid cargo-auditable failures.
|
||||
doCheck = false; # Disable test as it requires network access.
|
||||
|
||||
@@ -180,6 +177,11 @@
|
||||
|
||||
CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
|
||||
LD = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
|
||||
|
||||
OPENSSL_LIB_DIR = "${pkgsCross.pkgsStatic.openssl.out}/lib";
|
||||
OPENSSL_INCLUDE_DIR = "${pkgsCross.pkgsStatic.openssl.dev}/include";
|
||||
OPENSSL_STATIC = "1";
|
||||
OPENSSL_NO_VENDOR = "1";
|
||||
};
|
||||
|
||||
mk-aarch64-RustPackage = mkCrossRustPackage "aarch64-unknown-linux-musl" "aarch64-unknown-linux-musl";
|
||||
|
||||
Reference in New Issue
Block a user