diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2020-02-12 17:00:19 +0100 |
---|---|---|
committer | Andreas Rammhold <andreas@rammhold.de> | 2020-02-12 17:16:32 +0100 |
commit | 5c8612d90cc9028d6b99804ea08c266a1db7f236 (patch) | |
tree | ba8ee1b4378f613f0dbdae14f58fe6622e200dba /pkgs/development/compilers/rust/cargo.nix | |
parent | 5a001981dbbf9cc73ae11a5b435a25ae2f08d5a6 (diff) |
cargo: use bundled libgit2
Cargo uses git-rs which is made to be built against the bundled libgit2 version that hasn't been part of a stable release yet. Using our libgit2 instead of the master version fails during runtime as they are not compatible anymore. After the next libgit2 update we can try again but it is likely that there will also be yet another cargo release at that point in timeā¦
Diffstat (limited to 'pkgs/development/compilers/rust/cargo.nix')
-rw-r--r-- | pkgs/development/compilers/rust/cargo.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index f639d330566de..6259101f6b64f 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,5 +1,5 @@ { stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib -, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 +, makeWrapper, libiconv, cacert, rustPlatform, rustc , CoreFoundation, Security }: @@ -18,10 +18,12 @@ rustPlatform.buildRustPackage { dontUpdateAutotoolsGnuConfigScripts = true; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; - buildInputs = [ cacert file curl python3 openssl zlib libgit2 ] + buildInputs = [ cacert file curl python3 openssl zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; - LIBGIT2_SYS_USE_PKG_CONFIG = 1; + # cargo uses git-rs which is made for a version of libgit2 from recent master that + # is not compatible with the current version in nixpkgs. + #LIBGIT2_SYS_USE_PKG_CONFIG = 1; # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel RUSTC_BOOTSTRAP = 1; |