diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-02-18 15:18:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 15:18:44 +0100 |
| commit | 453589696b99fe23605ff4d00215b7da2c52dfee (patch) | |
| tree | 6e540919271eb1b0310cde874f8a3d415a818c9b /pkgs/build-support/rust/build-rust-crate | |
| parent | 0bcd9a5262d8ef224f3895dd9e76737b95628ad3 (diff) | |
| parent | be5597fc9d2f4fefac097d3c6e9364bedf548078 (diff) | |
| download | nixpkgs-453589696b99fe23605ff4d00215b7da2c52dfee.tar nixpkgs-453589696b99fe23605ff4d00215b7da2c52dfee.tar.gz nixpkgs-453589696b99fe23605ff4d00215b7da2c52dfee.tar.bz2 nixpkgs-453589696b99fe23605ff4d00215b7da2c52dfee.tar.lz nixpkgs-453589696b99fe23605ff4d00215b7da2c52dfee.tar.xz nixpkgs-453589696b99fe23605ff4d00215b7da2c52dfee.tar.zst nixpkgs-453589696b99fe23605ff4d00215b7da2c52dfee.zip | |
Merge pull request #79816 from andir/buildRustCrate-no-override-dep
buildRustCrate: remove superfluous dependency overrides
Diffstat (limited to 'pkgs/build-support/rust/build-rust-crate')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 569b48d25ae..94b64a1225c 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -62,9 +62,6 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr extraRustcOpts_ = extraRustcOpts; buildTests_ = buildTests; - # take a list of crates that we depend on and override them to fit our overrides, rustc, release, … - makeDependencies = map (dep: lib.getLib (dep.override { inherit release verbose crateOverrides; })); - # crate2nix has a hack for the old bash based build script that did split # entries at `,`. No we have to work around that hack. # https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89 @@ -93,8 +90,8 @@ stdenv.mkDerivation (rec { name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; depsBuildBuild = [ rust stdenv.cc ]; buildInputs = (crate.buildInputs or []) ++ buildInputs_; - dependencies = makeDependencies dependencies_; - buildDependencies = makeDependencies buildDependencies_; + dependencies = map lib.getLib dependencies_; + buildDependencies = map lib.getLib buildDependencies_; completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies); completeBuildDeps = lib.unique ( |