mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-20 20:53:48 +00:00
5f72a823de
Needs to do a build in 2-pass now since Google stopped shipping all dependencies needed to build Flutter. This may be an oversight from them since they used to ship everything, but this makes the whole build process more robust. The first step will download all dependencies from pub, and the second step will build Flutter. Since we need to build repository first, we also require a new depsSha256 parameter to be passed, that represents the SHA256 of the resulting derivation of all Flutter dependencies downloaded from https://pub.dev. This commit also makes some changes in mkFlutter, allowing the user to pass src instead of passing version/channel/filename, allowing for more flexibility (i.e: building from a local fork of Flutter).
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
|
|
index 8d613de739..a673466726 100644
|
|
--- a/bin/internal/shared.sh
|
|
+++ b/bin/internal/shared.sh
|
|
@@ -204,8 +204,6 @@ function shared::execute() {
|
|
# FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
|
|
# FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
|
|
|
|
- upgrade_flutter 7< "$PROG_NAME"
|
|
-
|
|
BIN_NAME="$(basename "$PROG_NAME")"
|
|
case "$BIN_NAME" in
|
|
flutter*)
|
|
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
|
index 8a1a1e29da..778f253358 100644
|
|
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
|
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
|
@@ -293,13 +293,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
|
|
globals.flutterUsage.suppressAnalytics = true;
|
|
}
|
|
|
|
- try {
|
|
- await globals.flutterVersion.ensureVersionFile();
|
|
- } on FileSystemException catch (e) {
|
|
- globals.printError('Failed to write the version file to the artifact cache: "$e".');
|
|
- globals.printError('Please ensure you have permissions in the artifact cache directory.');
|
|
- throwToolExit('Failed to write the version file');
|
|
- }
|
|
final bool machineFlag = topLevelResults['machine'] as bool;
|
|
if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) {
|
|
await globals.flutterVersion.checkFlutterVersionFreshness();
|