From da84602f616f51cb04ff9b416dc821f036b00a2b Mon Sep 17 00:00:00 2001 From: Darius Jahandarie Date: Tue, 11 Dec 2018 15:53:20 -0500 Subject: [PATCH] buildRustCrate: fix extraRustcOpts so it is not discarded --- pkgs/build-support/rust/build-rust-crate/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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