Unverified Commit 57ce23c7 authored by 0x4A6F's avatar 0x4A6F Committed by GitHub
Browse files

Merge pull request #286750 from helsinki-systems/feat/flutter-aarch64-darwin 

flutter313/flutter316: Fix aarch64-darwin
parents 850b3bfc ab168d1f

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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
{ darwin }:

{

  buildInputs ? [ ],

  ...

}:

{

  postPatch = ''

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

      # Remove impure references to `arch` and use arm64 instead of arm64e.

      substituteInPlace lib/src/ios/xcodeproj.dart \

        --replace-fail /usr/bin/arch '${darwin.adv_cmds}/bin/arch' \

        --replace-fail arm64e arm64

    fi

  '';

}

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

+13 −2
Original line number Diff line number Diff line 
{ systemPlatform

{ lib

, stdenv

, systemPlatform

, buildDartApplication

, git

, which
@@ -7,6 +9,7 @@ 
, flutterSrc

, patches ? [ ]

, pubspecLock

, darwin

}:



buildDartApplication.override { inherit dart; } rec {
@@ -21,7 +24,15 @@ buildDartApplication.override { inherit dart; } rec { 
  inherit patches;

  # The given patches are made for the entire SDK source tree.

  prePatch = ''pushd "$NIX_BUILD_TOP/source"'';

  postPatch = ''popd'';

  postPatch = ''

    popd

  ''

  # Remove impure references to `arch` and use arm64 instead of arm64e.

  + lib.optionalString stdenv.isDarwin ''

    substituteInPlace lib/src/ios/xcodeproj.dart \

      --replace-fail /usr/bin/arch '${darwin.adv_cmds}/bin/arch' \

      --replace-fail arm64e arm64

  '';



  # When the JIT snapshot is being built, the application needs to run.

  # It attempts to generate configuration files, and relies on a few external

pkgs/development/compilers/flutter/flutter.nix

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ let 
        '';

        homepage = "https://flutter.dev";

        license = licenses.bsd3;

        platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];

        platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];

        maintainers = with maintainers; [ babariviere ericdallo FlafyDev hacker1024 ];

      };

    };

pkgs/development/compilers/flutter/patches/override-host-platform.patch

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ index 1ce1951cef..1bd7602318 100644 
+    'x86_64-linux' => HostPlatform.linux_x64,

+    'aarch64-linux' => HostPlatform.linux_arm64,

+    'x86_64-darwin' => HostPlatform.darwin_x64,

+    'arm64-darwin' => HostPlatform.darwin_arm64,

+    'aarch64-darwin' => HostPlatform.darwin_arm64,

+    String value => throw ArgumentError.value(value, 'NIX_FLUTTER_HOST_PLATFORM', 'Unknown Nix host platform!'),

+  };

pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ let 
    "x86_64-linux"

    "aarch64-linux"

    "x86_64-darwin"

    "aarch64-darwin"

  ];



  derivations =