diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2019-12-12 00:13:19 +0100 |
---|---|---|
committer | Andreas Rammhold <andreas@rammhold.de> | 2019-12-12 01:03:41 +0100 |
commit | 3f49d7a3ea204b85223ce2c84c9b27d2aff60ee2 (patch) | |
tree | 9899109aa1596f6a1257295813d2b45a074e8399 /pkgs/build-support/rust/build-rust-crate/default.nix | |
parent | 6ad22f5b4d98b776ad9c7608fe293d347bb04f56 (diff) | |
download | nixpkgs-3f49d7a3ea204b85223ce2c84c9b27d2aff60ee2.tar nixpkgs-3f49d7a3ea204b85223ce2c84c9b27d2aff60ee2.tar.gz nixpkgs-3f49d7a3ea204b85223ce2c84c9b27d2aff60ee2.tar.bz2 nixpkgs-3f49d7a3ea204b85223ce2c84c9b27d2aff60ee2.tar.lz nixpkgs-3f49d7a3ea204b85223ce2c84c9b27d2aff60ee2.tar.xz nixpkgs-3f49d7a3ea204b85223ce2c84c9b27d2aff60ee2.tar.zst nixpkgs-3f49d7a3ea204b85223ce2c84c9b27d2aff60ee2.zip |
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.
Diffstat (limited to 'pkgs/build-support/rust/build-rust-crate/default.nix')
-rw-r--r-- | pkgs/build-support/rust/build-rust-crate/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
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 ( |