@@ -1,10 +1,36 @@
1−{ channel, pname, version, sha256Hash, patches, dart
2−, filename ? "flutter_linux_${version}-${channel}.tar.xz"}:
3−
4−{ bash, buildFHSUserEnv, cacert, coreutils, git, makeWrapper, runCommand, stdenv
5−, fetchurl, alsaLib, dbus, expat, libpulseaudio, libuuid, libX11, libxcb
6−, libXcomposite, libXcursor, libXdamage, libXfixes, libGL, nspr, nss, systemd }:
7−
1+{ channel
2+, pname
3+, version
4+, sha256Hash
5+, patches
6+, dart
7+, filename ? "flutter_linux_${version}-${channel}.tar.xz"
8+}:
9+
10+{ bash
11+, buildFHSUserEnv
12+, cacert
13+, coreutils
14+, git
15+, runCommand
16+, stdenv
17+, fetchurl
18+, alsaLib
19+, dbus
20+, expat
21+, libpulseaudio
22+, libuuid
23+, libX11
24+, libxcb
25+, libXcomposite
26+, libXcursor
27+, libXdamage
28+, libXfixes
29+, libGL
30+, nspr
31+, nss
32+, systemd
33+}:
834let
935 drvName = "flutter-${channel}-${version}";
1036 flutter = stdenv.mkDerivation {
@@ -16,7 +42,7 @@ let
1642 sha256 = sha256Hash;
1743 };
1844
19− buildInputs = [ makeWrapper git ];
45+ buildInputs = [ git ];
2046
2147 inherit patches;
2248
@@ -31,28 +57,27 @@ let
3157 SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"
3258 STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
3359 SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
34− DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk"
35−
36− DART="$DART_SDK_PATH/bin/dart"
37− PUB="$DART_SDK_PATH/bin/pub"
60+ DART_SDK_PATH="${dart}"
3861
3962 HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
4063 # path is relative otherwise it's replaced by /build/flutter
4164
42− (cd "$FLUTTER_TOOLS_DIR" && "$PUB" upgrade --offline)
65+ (cd "$FLUTTER_TOOLS_DIR" && ${dart}/bin/pub upgrade --offline)
4366
4467 local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
45− "$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"
4669 echo "$revision" > "$STAMP_PATH"
4770 echo -n "${version}" > version
4871
49− rm -rf bin/cache/{artifacts,downloads}
72+ rm -rf bin/cache/{artifacts,dart-sdk,downloads}
5073 rm -f bin/cache/*.stamp
5174 '';
5275
5376 installPhase = ''
5477 mkdir -p $out
5578 cp -r . $out
79+ mkdir -p $out/bin/cache/
80+ ln -sf ${dart} $out/bin/cache/dart-sdk
5681 '';
5782 };
5883
@@ -100,7 +125,9 @@ let
100125 ];
101126 };
102127
103−in runCommand drvName {
128+in
129+runCommand drvName
130+{
104131 startScript = ''
105132 #!${bash}/bin/bash
106133 export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"}
@@ -126,8 +153,4 @@ in runCommand drvName {
126153
127154 echo -n "$startScript" > $out/bin/${pname}
128155 chmod +x $out/bin/${pname}
129−
130− mkdir -p $out/bin/cache/dart-sdk/
131− cp -r ${dart}/* $out/bin/cache/dart-sdk/
132− ln $out/bin/cache/dart-sdk/bin/dart $out/bin/dart
133156''