public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40808 from Mic92/rust-curl-sys

Browse Source 
cargo-vendor: fix build
This commit is contained in:
Jörg Thalheim 2018-05-20 11:53:09 +01:00 committed by GitHub
commit 9d3693bde6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/rust/build-rust-crate.nix
View File

@ -47,7 +47,7 @@ let makeDeps = dependencies:
''; '';
configureCrate = configureCrate =
{ crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }: { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member, extraLinkFlags }:
let version_ = lib.splitString "-" crateVersion; let version_ = lib.splitString "-" crateVersion;
versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
version = lib.splitString "." (lib.head version_); version = lib.splitString "." (lib.head version_);
@ -79,6 +79,8 @@ let makeDeps = dependencies:
mkdir -p target/{deps,lib,build,buildDeps} mkdir -p target/{deps,lib,build,buildDeps}
chmod uga+w target -R chmod uga+w target -R
echo ${extraLinkFlags} > target/link
echo ${extraLinkFlags} > target/link.final
for i in ${completeDepsDir}; do for i in ${completeDepsDir}; do
symlink_dependency $i target/deps symlink_dependency $i target/deps
done done
@ -421,9 +423,11 @@ stdenv.mkDerivation (rec {
if lib.attrByPath ["plugin"] false crate then "dylib" else if lib.attrByPath ["plugin"] false crate then "dylib" else
(crate.type or "lib"); (crate.type or "lib");
colors = lib.attrByPath [ "colors" ] "always" crate; colors = lib.attrByPath [ "colors" ] "always" crate;
extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
configurePhase = configureCrate { configurePhase = configureCrate {
inherit crateName dependencies buildDependencies completeDeps completeBuildDeps inherit crateName dependencies buildDependencies completeDeps completeBuildDeps
crateFeatures libName build workspace_member release libPath crateVersion crateFeatures libName build workspace_member release libPath crateVersion
extraLinkFlags
crateAuthors verbose colors; crateAuthors verbose colors;
}; };
extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];

5
pkgs/build-support/rust/default-crate-overrides.nix
View File

@ -19,8 +19,9 @@ in
crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ]; crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
}; };
curl-sys = attrs: { curl-sys = attrs: {
buildInputs = [ pkgconfig zlib ]; buildInputs = [ pkgconfig zlib curl ];
propagatedBuiltInputs = [ curl ]; propagatedBuildInputs = [ curl zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"];
}; };
libgit2-sys = attrs: { libgit2-sys = attrs: {
LIBGIT2_SYS_USE_PKG_CONFIG = true; LIBGIT2_SYS_USE_PKG_CONFIG = true;