diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-22 11:58:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 11:58:07 +0000 |
| commit | 163d038c68623aad35843ce53461d517e545b7b6 (patch) | |
| tree | b027fa194273a647f044d24af644b5c8084ff05a | |
| parent | 35f58309a5f6b70442b4ab4066fd231ceb86d4d3 (diff) | |
| parent | a7ab32ba9884a27d438bc9affe47d5d1af3695df (diff) | |
| download | nixlib-163d038c68623aad35843ce53461d517e545b7b6.tar nixlib-163d038c68623aad35843ce53461d517e545b7b6.tar.gz nixlib-163d038c68623aad35843ce53461d517e545b7b6.tar.bz2 nixlib-163d038c68623aad35843ce53461d517e545b7b6.tar.lz nixlib-163d038c68623aad35843ce53461d517e545b7b6.tar.xz nixlib-163d038c68623aad35843ce53461d517e545b7b6.tar.zst nixlib-163d038c68623aad35843ce53461d517e545b7b6.zip | |
Merge pull request #35331 from Mic92/cargo-fix
cargo: unbreak aarch64 build
| -rw-r--r-- | pkgs/development/compilers/rust/cargo.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index fecf80a44853..46caabf33917 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec { passthru.rustc = rustc; + # changes hash of vendor directory otherwise on aarch64 + dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then "1" else null; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; |