Unverified Commit d749418f authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

flutter338: init at 3.38.0-0.2.pre (#454687)

parents 29ddf4bf e61e676f

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

+5 −5
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}" 
    ''

      export FLUTTER_ROOT="$NIX_BUILD_TOP"

      lndir -silent '${flutter'}' "$FLUTTER_ROOT"

      rm -rf "$FLUTTER_ROOT/bin/cache"

      rm --recursive --force "$FLUTTER_ROOT/bin/cache"

      mkdir "$FLUTTER_ROOT/bin/cache"

    ''

    + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
@@ -89,18 +89,18 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}" 
          flutter ? engine && flutter.engine.meta.available

        ) "--local-engine ${flutter.engine.outName}"

      } \

        -v '--${flutterPlatform}' ${

        --verbose '--${flutterPlatform}' ${

          builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))

        }



      rm -rf "$FLUTTER_ROOT/bin/cache/lockfile"

      rm --recursive --force "$FLUTTER_ROOT/bin/cache/lockfile"

    ''

    + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''

      rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk"

      rm --recursive --force "$FLUTTER_ROOT/bin/cache/dart-sdk"

    ''

    + ''

      find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete



      cp -r bin/cache "$out"

      cp --recursive bin/cache "$out"

    ''

  )

pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
  ...

}:

{

  # Use arm64 instead of arm64e.

  postPatch = ''

    if [ "$pname" == "flutter-tools" ]; then

      # Use arm64 instead of arm64e.

      substituteInPlace lib/src/ios/xcodeproj.dart \

        --replace-fail arm64e arm64

    fi

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

+3 −3
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ 
  installPhase = ''

    runHook preInstall



    mkdir -p "$out/bin"

    cp -r . "$out/bin/cache"

    rm -f "$out/bin/cache/flutter.version.json"

    mkdir --parents "$out/bin"

    cp --recursive . "$out/bin/cache"

    rm --force "$out/bin/cache/flutter.version.json"



    runHook postInstall

  '';

pkgs/development/compilers/flutter/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -54,19 +54,19 @@ let 
          sources = {

            "${dartVersion}-x86_64-linux" = fetchzip {

              url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";

              sha256 = dartHash.x86_64-linux;

              hash = dartHash.x86_64-linux;

            };

            "${dartVersion}-aarch64-linux" = fetchzip {

              url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";

              sha256 = dartHash.aarch64-linux;

              hash = dartHash.aarch64-linux;

            };

            "${dartVersion}-x86_64-darwin" = fetchzip {

              url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";

              sha256 = dartHash.x86_64-darwin;

              hash = dartHash.x86_64-darwin;

            };

            "${dartVersion}-aarch64-darwin" = fetchzip {

              url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip";

              sha256 = dartHash.aarch64-darwin;

              hash = dartHash.aarch64-darwin;

            };

          };

        };
@@ -75,7 +75,7 @@ let 
            source = fetchFromGitHub {

              owner = "flutter";

              repo = "flutter";

              rev = version;

              tag = version;

              hash = flutterHash;

            };

          in
@@ -83,7 +83,7 @@ let 
            if lib.versionAtLeast version "3.32" then

              # # Could not determine engine revision

              (runCommand source.name { } ''

                cp -r ${source} $out

                cp --recursive ${source} $out

                chmod +w $out/bin

                mkdir $out/bin/cache

                cp $out/bin/internal/engine.version $out/bin/cache/engine.stamp

pkgs/development/compilers/flutter/engine/dart.nix

+1 −4
Original line number Diff line number Diff line
@@ -3,13 +3,10 @@ runCommand "flutter-engine-${engine.version}-dart" 
  {

    version = engine.dartSdkVersion;



    inherit engine;

    inherit (engine) outName;



    meta = engine.meta // {

      description = "Dart SDK compiled from the Flutter Engine";

    };

  }

  ''

    ln -s ${engine}/out/$outName/dart-sdk $out

    ln --symbolic ${engine}/out/${engine.outName}/dart-sdk $out

  ''