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

buildRustCrate: deduplicate dependency override code

Browse Source 
The previous lines were only different in the kind of dependencies but
otherwise exactly the same. It makes the entire thing a bit more
readable by moving this into a function that takes care of this.
This commit is contained in:
Andreas Rammhold 2019-12-12 00:13:19 +01:00
parent 6ad22f5b4d
commit 3f49d7a3ea
No known key found for this signature in database
GPG Key ID: E432E410B5E48C86
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,15 +81,8 @@ stdenv.mkDerivation (rec {
name = "rust_${crate.crateName}-${crate.version}"; name = "rust_${crate.crateName}-${crate.version}";
depsBuildBuild = [ rust stdenv.cc ]; depsBuildBuild = [ rust stdenv.cc ];
buildInputs = (crate.buildInputs or []) ++ buildInputs_; buildInputs = (crate.buildInputs or []) ++ buildInputs_;
dependencies = dependencies = makeDependencies dependencies_;
map buildDependencies = makeDependencies buildDependencies_;
(dep: lib.getLib (dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }))
dependencies_;
buildDependencies =
map
(dep: lib.getLib (dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }))
buildDependencies_;
completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies); completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies);
completeBuildDeps = lib.unique ( completeBuildDeps = lib.unique (