diff options
author | hacker1024 <hacker1024@users.sourceforge.net> | 2023-10-22 18:33:32 +1100 |
---|---|---|
committer | Maciej Krüger <mkg20001@gmail.com> | 2023-12-21 11:44:08 +0100 |
commit | 175112a99621fc38faeacc4cdd36f7ded2209abe (patch) | |
tree | a778a022daee866cf392ea93ef7efb347d782889 | |
parent | 00a11274d4c4685d587bb8e13c17ceab1148a4ad (diff) |
flutter: Remove hard dependency on Git
-rw-r--r-- | pkgs/development/compilers/flutter/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/flutter/flutter.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 404738600e9e2..ca405c03a85d6 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -45,10 +45,6 @@ let owner = "flutter"; repo = "flutter"; rev = version; - # The Flutter SDK uses Git to obtain version information, - # and relies on many features that do not work with leaveDotGit alone. - # https://github.com/flutter/flutter/blob/master/packages/flutter_tools/lib/src/version.dart - deepClone = true; hash = flutterHash; }; }; @@ -85,7 +81,7 @@ in x86_64-darwin = "sha256-BchKowKd6BscVuk/dXibcQzdFkW9//GDfll77mHEI4M="; aarch64-darwin = "sha256-9yrx09vYrOTmdqkfJI7mfh7DI1/rg67tPlf82m5+iKI="; }; - flutterHash = "sha256-s6JLDNHRBq3kZjA5vZHID9DQPNn/CZT2a3C3uvV/M6g="; + flutterHash = "sha256-00G030FvZZTsdf9ruFs9jdIHcC5h+xpp4NlmL64qVZA="; patches = flutter3Patches; pubspecLockFile = ./lockfiles/stable/pubspec.lock; vendorHash = "sha256-lsFOvvmhszBcFb9XvabpqfL2Ek4wjhmB0OrcWUOURFQ="; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 714876fdb1b22..a96da5bd39c60 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -62,6 +62,10 @@ let cp -r . $out ln -sf ${dart} $out/bin/cache/dart-sdk + # The Flutter CLI launcher checks for the existance of a .git directory. + # https://github.com/flutter/flutter/blob/3.13.8/bin/internal/shared.sh#L224 + mkdir -p "$out/.git" + runHook postInstall ''; @@ -74,7 +78,7 @@ let export HOME="$(mktemp -d)" $out/bin/flutter config --android-studio-dir $HOME $out/bin/flutter config --android-sdk $HOME - $out/bin/flutter --version | fgrep -q '${version}' + $out/bin/flutter --version | fgrep -q '${builtins.substring 0 10 engineVersion}' runHook postInstallCheck ''; |