@@ -12,7 +12,6 @@
1212, cacert
1313, coreutils
1414, git
15−, makeWrapper
1615, runCommand
1716, stdenv
1817, fetchurl
@@ -43,7 +42,7 @@ let
4342 sha256 = sha256Hash;
4443 };
4544
46− buildInputs = [ makeWrapper git ];
45+ buildInputs = [ git ];
4746
4847 inherit patches;
4948
@@ -58,28 +57,27 @@ let
5857 SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"
5958 STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
6059 SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
61− DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk"
62−
63− DART="$DART_SDK_PATH/bin/dart"
64− PUB="$DART_SDK_PATH/bin/pub"
60+ DART_SDK_PATH="${dart}"
6561
6662 HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
6763 # path is relative otherwise it's replaced by /build/flutter
6864
69− (cd "$FLUTTER_TOOLS_DIR" && "$PUB" upgrade --offline)
65+ (cd "$FLUTTER_TOOLS_DIR" && ${dart}/bin/pub upgrade --offline)
7066
7167 local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
72− "$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
68+ ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
7369 echo "$revision" > "$STAMP_PATH"
7470 echo -n "${version}" > version
7571
76− rm -rf bin/cache/{artifacts,downloads}
72+ rm -rf bin/cache/{artifacts,dart-sdk,downloads}
7773 rm -f bin/cache/*.stamp
7874 '';
7975
8076 installPhase = ''
8177 mkdir -p $out
8278 cp -r . $out
79+ mkdir -p $out/bin/cache/
80+ ln -sf ${dart} $out/bin/cache/dart-sdk
8381 '';
8482 };
8583
@@ -155,8 +153,4 @@ runCommand drvName
155153
156154 echo -n "$startScript" > $out/bin/${pname}
157155 chmod +x $out/bin/${pname}
158−
159− mkdir -p $out/bin/cache/dart-sdk/
160− cp -r ${dart}/* $out/bin/cache/dart-sdk/
161− ln $out/bin/cache/dart-sdk/bin/dart $out/bin/dart
162156''