From a3c2b67513a23c5d984cf69d91f20a09144f6d53 Mon Sep 17 00:00:00 2001 From: EthanShoeDev <13422990+EthanShoeDev@users.noreply.github.com> Date: Tue, 7 Oct 2025 14:46:28 -0400 Subject: [PATCH] flake change --- flake.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index f5c1440..ff7c3ea 100644 --- a/flake.nix +++ b/flake.nix @@ -64,6 +64,7 @@ fen.targets.x86_64-linux-android.stable.rust-std fen.targets.i686-linux-android.stable.rust-std fen.targets.aarch64-apple-ios.stable.rust-std + fen.targets.aarch64-apple-ios-sim.stable.rust-std ]; defaultPkgs = with pkgs; [ @@ -94,6 +95,8 @@ clang-tools ]; + mkShellFn = if pkgs.stdenv.isDarwin then pkgs.mkShellNoCC else pkgs.mkShell; + ndkId = "27-1-12297006"; # nix flake show github:tadfisher/android-nixpkgs | grep ndk ndkAttr = "ndk-${ndkId}"; ndkVer = builtins.replaceStrings ["-"] ["."] ndkId; @@ -219,13 +222,13 @@ export PROMPT_COMMAND=". \"$FRESSH_STARSHIP_PREINIT\"" ''; in { - default = pkgs.mkShell { + default = mkShellFn { packages = defaultPkgs ++ [remoteAndroidSdk.androidSdk]; shellHook = commonAndroidInit remoteAndroidSdk.sdkRoot; }; - android-emulator = pkgs.mkShell { + android-emulator = mkShellFn { packages = defaultPkgs ++ [fullAndroidSdk.androidSdk]; shellHook = commonAndroidInit fullAndroidSdk.sdkRoot;