pyrox.dev
buildDartApplication: Refactor autoDepsList logic
authored by
hacker1024
and committed by
FlafyDev
4f623fa0
7c7cb950
+8
-5
pkgs/build-support/dart/build-dart-application/default.nix
+8
-5
pkgs/build-support/dart/build-dart-application/default.nix
···
53
53
let
54
54
generators = callPackage ./generators.nix { inherit dart; } { inherit sdkSetupScript; buildDrvArgs = args; };
55
55
56
-
depsList = if depsListFile == null then null else lib.importJSON depsListFile;
57
56
generatedDepsList = generators.mkDepsList { inherit pubspecLockFile pubspecLockData packageConfig; };
57
+
58
+
depsList =
59
+
if autoDepsList
60
+
then lib.importJSON generatedDepsList
61
+
else if depsListFile == null
62
+
then null
63
+
else lib.importJSON depsListFile;
58
64
59
65
pubspecLockFile = builtins.toJSON pubspecLock;
60
66
pubspecLockData = pub2nix.readPubspecLock { inherit src packageRoot pubspecLock gitHashes sdkSourceBuilders; };
···
133
139
});
134
140
135
141
packageOverrideRepository = (callPackage ../../../development/compilers/dart/package-overrides { }) // customPackageOverrides;
136
-
productPackages = builtins.filter (package: package.kind != "dev")
137
-
(if autoDepsList
138
-
then lib.importJSON generatedDepsList
139
-
else if depsList == null then [ ] else depsList);
142
+
productPackages = builtins.filter (package: package.kind != "dev") (if depsList == null then [ ] else depsList);
140
143
in
141
144
assert !(builtins.isString dartOutputType && dartOutputType != "") ->
142
145
throw "dartOutputType must be a non-empty string";