@@ -12,7 +12,6 @@
13, coreutils
13, coreutils
16, runCommand
15, runCommand
@@ -43,7 +42,7 @@ let
43 sha256 = sha256Hash;
42 sha256 = sha256Hash;
46− buildInputs = [ makeWrapper git ];
45+ buildInputs = [ git ];
48 inherit patches;
47 inherit patches;
@@ -58,28 +57,27 @@ let
58 SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"
57 SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"
59 STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
58 STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
60 SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
59 SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
61− DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk"
60+ DART_SDK_PATH="${dart}"
63− DART="$DART_SDK_PATH/bin/dart"
64− PUB="$DART_SDK_PATH/bin/pub"
66 HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
62 HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
67 # path is relative otherwise it's replaced by /build/flutter
63 # path is relative otherwise it's replaced by /build/flutter
69− (cd "$FLUTTER_TOOLS_DIR" && "$PUB" upgrade --offline)
65+ (cd "$FLUTTER_TOOLS_DIR" && ${dart}/bin/pub upgrade --offline)
71 local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
67 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"
73 echo "$revision" > "$STAMP_PATH"
69 echo "$revision" > "$STAMP_PATH"
74 echo -n "${version}" > version
70 echo -n "${version}" > version
76− rm -rf bin/cache/{artifacts,downloads}
72+ rm -rf bin/cache/{artifacts,dart-sdk,downloads}
77 rm -f bin/cache/*.stamp
73 rm -f bin/cache/*.stamp
80 installPhase = ''
76 installPhase = ''
81 mkdir -p $out
77 mkdir -p $out
82 cp -r . $out
78 cp -r . $out
79+ mkdir -p $out/bin/cache/
80+ ln -sf ${dart} $out/bin/cache/dart-sdk
@@ -155,8 +153,4 @@ runCommand drvName
156 echo -n "$startScript" > $out/bin/${pname}
154 echo -n "$startScript" > $out/bin/${pname}
157 chmod +x $out/bin/${pname}
155 chmod +x $out/bin/${pname}
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