diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 015cd13..734deb6 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -22,7 +22,17 @@ jobs:
           extra_nix_config: experimental-features = nix-command flakes flake-self-attrs
 
       - name: Build app
-        run: nix develop --command bash -c "flutter pub get && dart scripts/generate.dart && flutter pub run build_runner build && flutter build ios --release --no-codesign"
+        run: |
+          nix develop --command bash -c '
+            set -e
+            flutter pub get
+            dart scripts/generate.dart
+            flutter pub run build_runner build
+            # Nix-provided Flutter'"'"'s bundled frameworks are read-only, which
+            # breaks lipo when Flutter thins them into build/ (NixOS/nixpkgs#405066).
+            find "$(dirname "$(dirname "$(readlink -f "$(command -v flutter)")")")" -type d -iname "*.framework" -exec chmod -R u+w {} + 2>/dev/null || true
+            flutter build ios --release --no-codesign
+          '
 
       # Unsigned IPA: SideStore/AltStore re-sign this on-device with the
       # user's own Apple ID at install time, so no certificate is needed here.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index e7040fa..ccbd70e 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -21,8 +21,17 @@ jobs:
         with:
           extra_nix_config: experimental-features = nix-command flakes flake-self-attrs
 
-      - name: Build app
-        run: nix develop --command bash -c "flutter pub get && dart scripts/generate.dart && flutter pub run build_runner build && flutter build macos --release"
+      - run: |
+          nix develop --command bash -c '
+            set -e
+            flutter pub get
+            dart scripts/generate.dart
+            flutter pub run build_runner build
+            # Nix-provided Flutter'"'"'s bundled frameworks are read-only, which
+            # breaks lipo when Flutter thins them into build/ (NixOS/nixpkgs#405066).
+            find "$(dirname "$(dirname "$(readlink -f "$(command -v flutter)")")")" -type d -iname "*.framework" -exec chmod -R u+w {} + 2>/dev/null || true
+            flutter build macos --release
+          '
 
       - name: Upload installer artifact
         uses: actions/upload-artifact@v6
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 57b889d..ddd29ee 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -336,7 +336,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export PATH=\"$PROJECT_DIR/scripts:$PATH\"\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "ebin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin;
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -351,7 +351,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export PATH=\"$PROJECT_DIR/scripts:$PATH\"\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
 		EE82EC529EB6C0F1FA480659 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index 3dbb24b..57f7241 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -349,7 +349,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export PATH=\"$PROJECT_DIR/scripts:$PATH\"\necho \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n";
+			shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; 
 		};
 		33CC111E2044C6BF0003C045 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/scripts/lipo b/scripts/lipo
deleted file mode 100755
index eea1eea..0000000
--- a/scripts/lipo
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Workaround for NixOS/nixpkgs#405066: frameworks copied from the Nix store
-# stay read-only, so lipo can't write its temporary output file when Flutter
-# thins them during the build. Make the framework writable before delegating
-# to the real lipo.
-for arg in "$@"; do
-  case "$arg" in
-    */*.framework/*)
-      fw_dir="${arg%.framework/*}.framework"
-      chmod -R +w "$fw_dir" 2>/dev/null
-      ;;
-  esac
-done
-
-exec /usr/bin/lipo "$@"