From 3f49d7a3ea204b85223ce2c84c9b27d2aff60ee2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 12 Dec 2019 00:13:19 +0100 Subject: buildRustCrate: deduplicate dependency override code 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. --- pkgs/build-support/rust/build-rust-crate/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'pkgs/build-support/rust') diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 6b86d632335..d5d6bf30b7c 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -81,15 +81,8 @@ stdenv.mkDerivation (rec { name = "rust_${crate.crateName}-${crate.version}"; depsBuildBuild = [ rust stdenv.cc ]; buildInputs = (crate.buildInputs or []) ++ buildInputs_; - dependencies = - map - (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_; + dependencies = makeDependencies dependencies_; + buildDependencies = makeDependencies buildDependencies_; completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies); completeBuildDeps = lib.unique ( -- cgit 1.4.1