buildDartApplication: Refactor autoDepsList logic

1 files changed, 8 insertions, 5 deletions

diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix
index c9b03b28dd46..0f736beb1ef3 100644
--- a/pkgs/build-support/dart/build-dart-application/default.nix
+++ b/pkgs/build-support/dart/build-dart-application/default.nix
@@ -53,9 +53,15 @@
 let
   generators = callPackage ./generators.nix { inherit dart; } { inherit sdkSetupScript; buildDrvArgs = args; };
 
-  depsList = if depsListFile == null then null else lib.importJSON depsListFile;
   generatedDepsList = generators.mkDepsList { inherit pubspecLockFile pubspecLockData packageConfig; };
 
+  depsList =
+    if autoDepsList
+    then lib.importJSON generatedDepsList
+    else if depsListFile == null
+    then null
+    else lib.importJSON depsListFile;
+
   pubspecLockFile = builtins.toJSON pubspecLock;
   pubspecLockData = pub2nix.readPubspecLock { inherit src packageRoot pubspecLock gitHashes sdkSourceBuilders; };
   packageConfig = pub2nix.generatePackageConfig {
@@ -133,10 +139,7 @@ let
   });
 
   packageOverrideRepository = (callPackage ../../../development/compilers/dart/package-overrides { }) // customPackageOverrides;
-  productPackages = builtins.filter (package: package.kind != "dev")
-    (if autoDepsList
-    then lib.importJSON generatedDepsList
-    else if depsList == null then [ ] else depsList);
+  productPackages = builtins.filter (package: package.kind != "dev") (if depsList == null then [ ] else depsList);
 in
 assert !(builtins.isString dartOutputType && dartOutputType != "") ->
 throw "dartOutputType must be a non-empty string";