commit da6757fd9d0deff3fe5ead896834c3e3e70d8d66 · pyrox.dev/nixpkgs

+9 -1

pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix

···

       5
       5
        
       , unzip

     

       6
       6
        
       

     

       7
       7
        
       , flutterPlatform

     

       8
       8
       +
       , systemPlatform

     

       8
       9
        
       , flutter

     

       9
       10
        
       , hash

     

       10
       11
        
       }:

     
···

       25
       26
        
           # Use a version of Flutter with just enough capabilities to download

     

       26
       27
        
           # artifacts.

     

       27
       28
        
           supportedTargetFlutterPlatforms = [ ];

     

       29
       29
       +
       

     

       30
       30
       +
           # Modify flutter-tool's system platform in order to get the desired platform's hashes.

     

       31
       31
       +
           flutter = flutter.unwrapped.override {

     

       32
       32
       +
             flutterTools = flutter.unwrapped.tools.override {

     

       33
       33
       +
               inherit systemPlatform;

     

       34
       34
       +
             };

     

       35
       35
       +
           };

     

       28
       36
        
         };

     

       29
       37
        
       in

     

       30
       30
       -
       runCommand "flutter-artifacts-${flutterPlatform}"

     

       38
       38
       +
       runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"

     

       31
       39
        
       {

     

       32
       40
        
         nativeBuildInputs = [ xorg.lndir flutter' unzip ];

     

       33
       41

+2 -2

pkgs/development/compilers/flutter/flutter-tools.nix

···

       1
       1
       -
       { hostPlatform

     

       1
       1
       +
       { systemPlatform

     

       2
       2
        
       , buildDartApplication

     

       3
       3
        
       , git

     

       4
       4
        
       , which

     
···

       35
       35
        
         '';

     

       36
       36
        
       

     

       37
       37
        
         dartEntryPoints."flutter_tools.snapshot" = "bin/flutter_tools.dart";

     

       38
       38
       -
         dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${hostPlatform.system}" ];

     

       38
       38
       +
         dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${systemPlatform}" ];

     

       39
       39
        
       

     

       40
       40
        
         # The Dart wrapper launchers are useless for the Flutter tool - it is designed

     

       41
       41
        
         # to be launched from a snapshot by the SDK.

+9 -8

pkgs/development/compilers/flutter/flutter.nix

···

       12
       12
        
       , git

     

       13
       13
        
       , which

     

       14
       14
        
       , jq

     

       15
       15
       -
       }:

     

       16
       16
       -
       

     

       17
       17
       -
       let

     

       18
       18
       -
         tools = callPackage ./flutter-tools.nix {

     

       15
       15
       +
       , flutterTools ? callPackage ./flutter-tools.nix {

     

       19
       16
        
           inherit dart version;

     

       20
       17
        
           flutterSrc = src;

     

       21
       18
        
           inherit patches;

     

       22
       19
        
           inherit pubspecLock;

     

       23
       23
       -
         };

     

       20
       20
       +
           systemPlatform = stdenv.hostPlatform.system;

     

       21
       21
       +
         }

     

       22
       22
       +
       }:

     

       24
       23
        
       

     

       24
       24
       +
       let

     

       25
       25
        
         unwrapped =

     

       26
       26
        
           stdenv.mkDerivation {

     

       27
       27
        
             name = "flutter-${version}-unwrapped";

     
···

       59
       59
        
               # Add a flutter_tools artifact stamp, and build a snapshot.

     

       60
       60
        
               # This is the Flutter CLI application.

     

       61
       61
        
               echo "$(git rev-parse HEAD)" > bin/cache/flutter_tools.stamp

     

       62
       62
       -
               ln -s '${tools}/share/flutter_tools.snapshot' bin/cache/flutter_tools.snapshot

     

       62
       62
       +
               ln -s '${flutterTools}/share/flutter_tools.snapshot' bin/cache/flutter_tools.snapshot

     

       63
       63
        
       

     

       64
       64
        
               # Some of flutter_tools's dependencies contain static assets. The

     

       65
       65
        
               # application attempts to read its own package_config.json to find these

     

       66
       66
        
               # assets at runtime.

     

       67
       67
        
               mkdir -p packages/flutter_tools/.dart_tool

     

       68
       68
       -
               ln -s '${tools.pubcache}/package_config.json' packages/flutter_tools/.dart_tool/package_config.json

     

       68
       68
       +
               ln -s '${flutterTools.pubcache}/package_config.json' packages/flutter_tools/.dart_tool/package_config.json

     

       69
       69
        
       

     

       70
       70
        
               echo -n "${version}" > version

     

       71
       71
        
               cat <<EOF > bin/cache/flutter.version.json

     
···

       119
       119
        
             '';

     

       120
       120
        
       

     

       121
       121
        
             passthru = {

     

       122
       122
       -
               inherit dart engineVersion tools;

     

       122
       122
       +
               inherit dart engineVersion;

     

       123
       123
       +
               tools = flutterTools;

     

       123
       124
        
               # The derivation containing the original Flutter SDK files.

     

       124
       125
        
               # When other derivations wrap this one, any unmodified files

     

       125
       126
        
               # found here should be included as-is, for tooling compatibility.

+1

pkgs/development/compilers/flutter/wrapper.nix

···

       50
       50
        
           (callPackage ./artifacts/prepare-artifacts.nix {

     

       51
       51
        
             src = callPackage ./artifacts/fetch-artifacts.nix {

     

       52
       52
        
               inherit flutterPlatform;

     

       53
       53
       +
               systemPlatform = stdenv.hostPlatform.system;

     

       53
       54
        
               flutter = callPackage ./wrapper.nix { inherit flutter; };

     

       54
       55
        
               hash = artifactHashes.${flutterPlatform}.${stdenv.hostPlatform.system} or "";

     

       55
       56
        
             };