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

buildRustPackage: make cargoDeps logic easier to follow

Browse Source 
The old logic flow had the structure

  if ( … ) {
    if ( … ) {
      …
    } else {
      …
    }
  } else {
    …
  }

which is quite hard to follow in Nix. Instead we ensure that no if
expression is inside a then branch.

This change is zero rebuild, as no logic was changed.
This commit is contained in:
sternenseemann 2022-05-12 21:33:02 +02:00 committed by zowoq
parent 39936c75c5
commit 357da6c296
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/rust/build-rust-package/default.nix
View File

@ -59,8 +59,8 @@ assert buildType == "release" || buildType == "debug";
let
cargoDeps =
if cargoVendorDir == null
then if cargoLock != null then importCargoLock cargoLock
if cargoVendorDir != null then null
else if cargoLock != null then importCargoLock cargoLock
else fetchCargoTarball ({
inherit src srcs sourceRoot unpackPhase cargoUpdateHook;
name = cargoDepsName;
@ -69,8 +69,7 @@ let
hash = args.cargoHash;
} // lib.optionalAttrs (args ? cargoSha256) {
sha256 = args.cargoSha256;
} // depsExtraArgs)
else null;
} // depsExtraArgs);
# If we have a cargoSha256 fixed-output derivation, validate it at build time
# against the src fixed-output derivation to check consistency.