buildRustPackage: make cargoDeps logic easier to follow
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:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user