commit c276ee50c4c2dac4f28d5293424b3e963dcd567c · pyrox.dev/nixpkgs

+21 -8

pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch

···

       152
       152
        
        import 'package:process/process.dart';

     

       153
       153
        
        import 'package:unified_analytics/unified_analytics.dart';

     

       154
       154
        
        

     

       155
       155
       -
       @@ -154,9 +155,16 @@ class GradleUtils {

     

       155
       155
       +
       @@ -154,9 +155,29 @@ class GradleUtils {

     

       156
       156
        
          final Logger _logger;

     

       157
       157
        
          final OperatingSystemUtils _operatingSystemUtils;

     

       158
       158
        
        

     

       159
       159
       -
       +  List<String> get _requiredArguments => <String>[

     

       160
       160
       -
       +    '--project-cache-dir=${join(switch (globals.platform.environment['XDG_CACHE_HOME']) {

     

       161
       161
       -
       +      final String cacheHome => cacheHome,

     

       162
       162
       -
       +      _ => join(globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'), '.cache'),

     

       163
       163
       -
       +    }, 'flutter', 'nix-flutter-tools-gradle', globals.flutterVersion.engineRevision.substring(0, 10), 'cache')}',

     

       164
       164
       -
       +  ];

     

       159
       159
       +
       +  List<String> get _requiredArguments {

     

       160
       160
       +
       +    final String cacheDir = join(

     

       161
       161
       +
       +      switch (globals.platform.environment['XDG_CACHE_HOME']) {

     

       162
       162
       +
       +        final String cacheHome => cacheHome,

     

       163
       163
       +
       +        _ => join(

     

       164
       164
       +
       +          globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'),

     

       165
       165
       +
       +          '.cache',

     

       166
       166
       +
       +        ),

     

       167
       167
       +
       +      },

     

       168
       168
       +
       +      'flutter',

     

       169
       169
       +
       +      'nix-flutter-tools-gradle',

     

       170
       170
       +
       +      globals.flutterVersion.engineRevision.substring(0, 10),

     

       171
       171
       +
       +    );

     

       172
       172
       +
       +

     

       173
       173
       +
       +    return <String>[

     

       174
       174
       +
       +      '--project-cache-dir=${join(cacheDir, 'cache')}',

     

       175
       175
       +
       +      '-Pkotlin.project.persistent.dir=${join(cacheDir, 'kotlin')}',

     

       176
       176
       +
       +    ];

     

       177
       177
       +
       +  }

     

       165
       178
        
       +

     

       166
       179
        
          /// Gets the Gradle executable path and prepares the Gradle project.

     

       167
       180
        
          /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory.

     
···

       170
       183
        
            final Directory androidDir = project.android.hostAppGradleRoot;

     

       171
       184
        
            injectGradleWrapperIfNeeded(androidDir);

     

       172
       185
        
        

     

       173
       173
       -
       @@ -167,7 +175,7 @@ class GradleUtils {

     

       186
       186
       +
       @@ -167,7 +188,7 @@ class GradleUtils {

     

       174
       187
        
              // If the Gradle executable doesn't have execute permission,

     

       175
       188
        
              // then attempt to set it.

     

       176
       189
        
              _operatingSystemUtils.makeExecutable(gradle);

+21 -8

pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch

···

       152
       152
        
        import 'package:process/process.dart';

     

       153
       153
        
        import 'package:unified_analytics/unified_analytics.dart';

     

       154
       154
        
        

     

       155
       155
       -
       @@ -154,9 +155,16 @@ class GradleUtils {

     

       155
       155
       +
       @@ -154,9 +155,29 @@ class GradleUtils {

     

       156
       156
        
          final Logger _logger;

     

       157
       157
        
          final OperatingSystemUtils _operatingSystemUtils;

     

       158
       158
        
        

     

       159
       159
       -
       +  List<String> get _requiredArguments => <String>[

     

       160
       160
       -
       +    '--project-cache-dir=${join(switch (globals.platform.environment['XDG_CACHE_HOME']) {

     

       161
       161
       -
       +      final String cacheHome => cacheHome,

     

       162
       162
       -
       +      _ => join(globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'), '.cache'),

     

       163
       163
       -
       +    }, 'flutter', 'nix-flutter-tools-gradle', globals.flutterVersion.engineRevision.substring(0, 10), 'cache')}',

     

       164
       164
       -
       +  ];

     

       159
       159
       +
       +  List<String> get _requiredArguments {

     

       160
       160
       +
       +    final String cacheDir = join(

     

       161
       161
       +
       +      switch (globals.platform.environment['XDG_CACHE_HOME']) {

     

       162
       162
       +
       +        final String cacheHome => cacheHome,

     

       163
       163
       +
       +        _ => join(

     

       164
       164
       +
       +          globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'),

     

       165
       165
       +
       +          '.cache',

     

       166
       166
       +
       +        ),

     

       167
       167
       +
       +      },

     

       168
       168
       +
       +      'flutter',

     

       169
       169
       +
       +      'nix-flutter-tools-gradle',

     

       170
       170
       +
       +      globals.flutterVersion.engineRevision.substring(0, 10),

     

       171
       171
       +
       +    );

     

       172
       172
       +
       +

     

       173
       173
       +
       +    return <String>[

     

       174
       174
       +
       +      '--project-cache-dir=${join(cacheDir, 'cache')}',

     

       175
       175
       +
       +      '-Pkotlin.project.persistent.dir=${join(cacheDir, 'kotlin')}',

     

       176
       176
       +
       +    ];

     

       177
       177
       +
       +  }

     

       165
       178
        
       +

     

       166
       179
        
          /// Gets the Gradle executable path and prepares the Gradle project.

     

       167
       180
        
          /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory.

     
···

       170
       183
        
            final Directory androidDir = project.android.hostAppGradleRoot;

     

       171
       184
        
            injectGradleWrapperIfNeeded(androidDir);

     

       172
       185
        
        

     

       173
       173
       -
       @@ -167,7 +175,7 @@ class GradleUtils {

     

       186
       186
       +
       @@ -167,7 +188,7 @@ class GradleUtils {

     

       174
       187
        
              // If the Gradle executable doesn't have execute permission,

     

       175
       188
        
              // then attempt to set it.

     

       176
       189
        
              _operatingSystemUtils.makeExecutable(gradle);