diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2019-12-11 23:27:58 +0100 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2019-12-11 23:27:58 +0100 |
| commit | 5ad83267ed42d25649ba378a27a7e2f14df2c0b3 (patch) | |
| tree | 99d7503a18a23d2d45468c04e3359c36fde11f73 /pkgs/build-support/rust | |
| parent | d37f0011648a97b9dce94572a52c48cfd77933a6 (diff) | |
| download | nixpkgs-5ad83267ed42d25649ba378a27a7e2f14df2c0b3.tar nixpkgs-5ad83267ed42d25649ba378a27a7e2f14df2c0b3.tar.gz nixpkgs-5ad83267ed42d25649ba378a27a7e2f14df2c0b3.tar.bz2 nixpkgs-5ad83267ed42d25649ba378a27a7e2f14df2c0b3.tar.lz nixpkgs-5ad83267ed42d25649ba378a27a7e2f14df2c0b3.tar.xz nixpkgs-5ad83267ed42d25649ba378a27a7e2f14df2c0b3.tar.zst nixpkgs-5ad83267ed42d25649ba378a27a7e2f14df2c0b3.zip | |
buildRustCrate: reflow the way `extraRustcOpts` is constructed
This should make it more obvious that we have three parts to it and not just one long gibberish string that makes up all of it.
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/default.nix | 5 |
1 files changed, 4 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 fc43d78650a..c7a5122da98 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -126,7 +126,10 @@ stdenv.mkDerivation (rec { colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = lib.concatStringsSep " " (crate.extraLinkFlags or []); edition = crate.edition or null; - extraRustcOpts = lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts ++ extraRustcOpts_ ++ (lib.optional (edition != null) "--edition ${edition}"); + extraRustcOpts = + lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts + ++ extraRustcOpts_ + ++ (lib.optional (edition != null) "--edition ${edition}"); configurePhase = configureCrate { inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription |