@@ -1,5 +1,5 @@
11{ stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib
2−, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
2+, installShellFiles, makeWrapper, libiconv, cacert, rustPlatform, rustc
33, CoreFoundation, Security
44}:
55
@@ -17,11 +17,13 @@ rustPlatform.buildRustPackage {
1717 # changes hash of vendor directory otherwise
1818 dontUpdateAutotoolsGnuConfigScripts = true;
1919
20− nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
21− buildInputs = [ cacert file curl python3 openssl zlib libgit2 ]
20+ nativeBuildInputs = [ pkgconfig cmake installShellFiles makeWrapper ];
21+ buildInputs = [ cacert file curl python3 openssl zlib ]
2222 ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
2323
24− LIBGIT2_SYS_USE_PKG_CONFIG = 1;
24+ # cargo uses git-rs which is made for a version of libgit2 from recent master that
25+ # is not compatible with the current version in nixpkgs.
26+ #LIBGIT2_SYS_USE_PKG_CONFIG = 1;
2527
2628 # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
2729 RUSTC_BOOTSTRAP = 1;
@@ -35,6 +37,8 @@ rustPlatform.buildRustPackage {
3537 --suffix PATH : "${rustc}/bin" \
3638 --set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \
3739 --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt"
40+
41+ installManPage src/tools/cargo/src/etc/man/*
3842 '';
3943
4044 checkPhase = ''