aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch
index 64950d4476ef..dc77496edb31 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch
+++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch
@@ -1,8 +1,8 @@
diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart
-index 8e511eefd..fef3cca8b 100644
+index d045c83f04..d51973020b 100644
--- a/dev/devicelab/lib/framework/runner.dart
+++ b/dev/devicelab/lib/framework/runner.dart
-@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async {
+@@ -136,7 +136,7 @@ Future<void> cleanupSystem() async {
print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)');
final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.');
@@ -12,7 +12,7 @@ index 8e511eefd..fef3cca8b 100644
if (!Platform.isWindows) {
await exec(
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
-index c680de599..480abfb77 100644
+index 8da01315ae..bb8d61d7f2 100644
--- a/packages/flutter_tools/lib/src/asset.dart
+++ b/packages/flutter_tools/lib/src/asset.dart
@@ -8,6 +8,7 @@ import 'package:meta/meta.dart';
@@ -23,20 +23,20 @@ index c680de599..480abfb77 100644
import 'base/context.dart';
import 'base/file_system.dart';
import 'base/utils.dart';
-@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
+@@ -399,7 +400,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) {
final Uri entryUri = globals.fs.path.toUri(font['asset'] as String);
result.add(_Asset(
- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
-+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
relativeUri: Uri(path: entryUri.pathSegments.last),
entryUri: entryUri,
package: null,
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
-index c0946782c..bdbc35cb8 100644
+index a35d8f87d0..a40027dc74 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart
-@@ -202,8 +202,15 @@ class Cache {
+@@ -215,8 +215,15 @@ class Cache {
return;
}
assert(_lock == null);
@@ -53,7 +53,7 @@ index c0946782c..bdbc35cb8 100644
try {
_lock = lockFile.openSync(mode: FileMode.write);
} on FileSystemException catch (e) {
-@@ -306,7 +313,7 @@ class Cache {
+@@ -319,7 +326,7 @@ class Cache {
if (_rootOverride != null) {
return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache'));
} else {