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

buildRustCrate: reflow the way extraRustcOpts is constructed

Browse Source 
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.
This commit is contained in:
Andreas Rammhold
2019-12-11 23:27:58 +01:00
parent d37f001164
commit 5ad83267ed
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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