From 95520e146bc36504c87bfb7538b4e487e5be7950 Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Mon, 18 Mar 2024 16:59:10 +0100
Subject: [PATCH] flutter: Fix reference to the `arch` binary on macOS

---
 .../compilers/flutter/artifacts/overrides/darwin.nix            | 2 +-
 pkgs/development/compilers/flutter/flutter-tools.nix            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix b/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
index b03b14f68c8b641..428254ee043a3cf 100644
--- a/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
+++ b/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
@@ -8,7 +8,7 @@
     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 /usr/bin/arch '${darwin.system_cmds}/bin/arch' \
         --replace-fail arm64e arm64
     fi
   '';
diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix
index f4bf84ad366ff6b..25dee1da87b65ed 100644
--- a/pkgs/development/compilers/flutter/flutter-tools.nix
+++ b/pkgs/development/compilers/flutter/flutter-tools.nix
@@ -30,7 +30,7 @@ buildDartApplication.override { inherit dart; } rec {
   # 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 /usr/bin/arch '${darwin.system_cmds}/bin/arch' \
       --replace-fail arm64e arm64
   '';