diff options
| author | Darius Jahandarie <djahandarie@gmail.com> | 2018-12-11 15:53:20 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2018-12-12 01:21:46 -0600 |
| commit | da84602f616f51cb04ff9b416dc821f036b00a2b (patch) | |
| tree | fa73b1d1772e21c157947e48cec2fa3c3e812cdd /pkgs/build-support/rust | |
| parent | d36846d367a1a45444d8750ca05485e36f1afed9 (diff) | |
| download | nixpkgs-da84602f616f51cb04ff9b416dc821f036b00a2b.tar nixpkgs-da84602f616f51cb04ff9b416dc821f036b00a2b.tar.gz nixpkgs-da84602f616f51cb04ff9b416dc821f036b00a2b.tar.bz2 nixpkgs-da84602f616f51cb04ff9b416dc821f036b00a2b.tar.lz nixpkgs-da84602f616f51cb04ff9b416dc821f036b00a2b.tar.xz nixpkgs-da84602f616f51cb04ff9b416dc821f036b00a2b.tar.zst nixpkgs-da84602f616f51cb04ff9b416dc821f036b00a2b.zip | |
buildRustCrate: fix extraRustcOpts so it is not discarded
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index ec11472bbae..dbb2f1b80cc 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -75,6 +75,7 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr ]; extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate; buildInputs_ = buildInputs; + extraRustcOpts_ = extraRustcOpts; in stdenv.mkDerivation (rec { @@ -141,7 +142,7 @@ stdenv.mkDerivation (rec { extraLinkFlags crateAuthors verbose colors target_os; }; - extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; + extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_; buildPhase = buildCrate { inherit crateName dependencies crateFeatures libName release libPath crateType |