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

buildRustCrate: rename makeDeps function to mkRustcDepArgs

Browse Source 
This should carry the function better then `makeDeps` as it isn't
producing deps but the rustc arguments required to link against those.
This commit is contained in:
Andreas Rammhold 2019-12-11 23:21:38 +01:00
parent f4aeabd04a
commit d37f001164
No known key found for this signature in database
GPG Key ID: E432E410B5E48C86
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, echo_build_heading, noisily, makeDeps, rust }: { lib, stdenv, echo_build_heading, noisily, mkRustcDepArgs, rust }:
{ crateName, { crateName,
dependencies, dependencies,
crateFeatures, crateRenames, libName, release, libPath, crateFeatures, crateRenames, libName, release, libPath,
@ -7,7 +7,7 @@
let let
deps = makeDeps dependencies crateRenames; deps = mkRustcDepArgs dependencies crateRenames;
rustcOpts = rustcOpts =
lib.foldl' (opts: opt: opts + " " + opt) lib.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2") (if release then "-C opt-level=3" else "-C debuginfo=2")

4
pkgs/build-support/rust/build-rust-crate/configure-crate.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, echo_build_heading, noisily, makeDeps }: { lib, stdenv, echo_build_heading, noisily, mkRustcDepArgs }:
{ build { build
, buildDependencies , buildDependencies
, colors , colors
@ -25,7 +25,7 @@ let version_ = lib.splitString "-" crateVersion;
rustcOpts = lib.foldl' (opts: opt: opts + " " + opt) rustcOpts = lib.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2") (if release then "-C opt-level=3" else "-C debuginfo=2")
(["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
buildDeps = makeDeps buildDependencies crateRenames; buildDeps = mkRustcDepArgs buildDependencies crateRenames;
authors = lib.concatStringsSep ":" crateAuthors; authors = lib.concatStringsSep ":" crateAuthors;
optLevel = if release then 3 else 0; optLevel = if release then 3 else 0;
completeDepsDir = lib.concatStringsSep " " completeDeps; completeDepsDir = lib.concatStringsSep " " completeDeps;

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

@ -13,7 +13,9 @@ let
then "macos" then "macos"
else stdenv.hostPlatform.parsed.kernel.name; else stdenv.hostPlatform.parsed.kernel.name;
makeDeps = dependencies: crateRenames: # Create rustc arguments to link against the given list of dependencies and
# renames
mkRustcDepArgs = dependencies: crateRenames:
lib.concatMapStringsSep " " (dep: lib.concatMapStringsSep " " (dep:
let let
extern = lib.replaceStrings ["-"] ["_"] dep.libName; extern = lib.replaceStrings ["-"] ["_"] dep.libName;
@ -27,15 +29,14 @@ let
" --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
) dependencies; ) dependencies;
inherit (import ./log.nix { inherit lib; }) noisily echo_build_heading; inherit (import ./log.nix { inherit lib; }) noisily echo_build_heading;
configureCrate = import ./configure-crate.nix { configureCrate = import ./configure-crate.nix {
inherit lib stdenv echo_build_heading noisily makeDeps; inherit lib stdenv echo_build_heading noisily mkRustcDepArgs;
}; };
buildCrate = import ./build-crate.nix { buildCrate = import ./build-crate.nix {
inherit lib stdenv echo_build_heading noisily makeDeps rust; inherit lib stdenv echo_build_heading noisily mkRustcDepArgs rust;
}; };
installCrate = import ./install-crate.nix; installCrate = import ./install-crate.nix;