diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-30 02:46:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-30 02:46:04 +0100 |
commit | b2b193abc5587a058d9526caa9e9f8b5e62ba1e3 (patch) | |
tree | 73ad34be37b7e0bfc6334eba796868d0a16f8564 /pkgs | |
parent | ffc9c0378f05da3232bd6ed51fe458dc00549843 (diff) | |
parent | 910d06bb9038c11b26bc7439c26afe6ef77fc1a3 (diff) |
Merge pull request #111187 from thiagokokada/revert-flutter-bump
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/flutter/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/flutter/flutter.nix | 20 | ||||
-rw-r--r-- | pkgs/development/compilers/flutter/repository.nix | 24 |
3 files changed, 12 insertions, 40 deletions
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 8572040cb0cd..14f4d93caa03 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,11 +1,10 @@ { callPackage, fetchurl, dart }: - let mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "1.22.5"; + version = "1.22.4"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; in @@ -14,11 +13,10 @@ in stable = mkFlutter rec { inherit dart version; pname = "flutter"; - patches = getPatches ./patches; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; - sha256 = "1dv5kczcj9npf7xxlanmpc9ijnxa3ap46521cxn14c0i3y9295ja"; + sha256 = "0qalgav9drqddcj8lfvl9ddf3325n953pvkmgha47lslg9sa88zw"; }; - depsSha256 = "0d7vhk6axgqajy2d9ia9lc6awcnz6cc3n04r7hnh7bx4hb0jv0l1"; + patches = getPatches ./patches; }; } diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index e3fcf77e391c..8cac4a18fbea 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -3,7 +3,6 @@ , patches , dart , src -, depsSha256 }: { bash @@ -30,18 +29,13 @@ , nspr , nss , systemd -, callPackage }: let - repository = callPackage ./repository.nix { - inherit src pname version dart depsSha256; - }; drvName = "flutter-${version}"; - flutter = stdenv.mkDerivation { name = "${drvName}-unwrapped"; - buildInputs = [ git repository ]; + buildInputs = [ git ]; inherit src patches; @@ -55,12 +49,13 @@ let export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" - mkdir -p "$out/bin/cache" - export SNAPSHOT_PATH="$out/bin/cache/flutter_tools.snapshot" - export STAMP_PATH="$out/bin/cache/flutter_tools.stamp" + export SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" + export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" export DART_SDK_PATH="${dart}" - export PUB_CACHE="${repository}" + + HOME=../.. # required for pub upgrade --offline, ~/.pub-cache + # path is relative otherwise it's replaced by /build/flutter pushd "$FLUTTER_TOOLS_DIR" ${dart}/bin/pub get --offline @@ -70,6 +65,9 @@ let ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" echo "$revision" > "$STAMP_PATH" echo -n "${version}" > version + + rm -r bin/cache/{artifacts,dart-sdk,downloads} + rm bin/cache/*.stamp ''; installPhase = '' diff --git a/pkgs/development/compilers/flutter/repository.nix b/pkgs/development/compilers/flutter/repository.nix deleted file mode 100644 index 0f8de0a912f1..000000000000 --- a/pkgs/development/compilers/flutter/repository.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, dart, fetchurl, src, pname, version, depsSha256 }: - -stdenv.mkDerivation { - inherit src version; - - pname = "${pname}-deps"; - buildInputs = [ dart ]; - - buildPhase = '' - export PUB_CACHE="$out" - export FLUTTER_ROOT="$(pwd)" - export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" - - pushd "$FLUTTER_TOOLS_DIR" - ${dart}/bin/pub get - ''; - - dontInstall = true; - dontFixup = true; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = depsSha256; -} |