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

buildRustCrate: fix extraRustcOpts so it is not discarded

Browse Source
This commit is contained in:
Darius Jahandarie 2018-12-11 15:53:20 -05:00 committed by Austin Seipp
parent d36846d367
commit da84602f61
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,7 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr
]; ];
extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate; extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate;
buildInputs_ = buildInputs; buildInputs_ = buildInputs;
extraRustcOpts_ = extraRustcOpts;
in in
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
@ -141,7 +142,7 @@ stdenv.mkDerivation (rec {
extraLinkFlags extraLinkFlags
crateAuthors verbose colors target_os; crateAuthors verbose colors target_os;
}; };
extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_;
buildPhase = buildCrate { buildPhase = buildCrate {
inherit crateName dependencies inherit crateName dependencies
crateFeatures libName release libPath crateType crateFeatures libName release libPath crateType