Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

Playground iOS build (#848)

uuuvn3dd760a8558b
diff --git a/.envrc b/.envrc
index 3550a30f2..a777f6e0f 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,15 @@
-use flake
+if [[ -z "${USE_HOST_XCODE:-}" ]]; then
+ if xcrun metal --version >/dev/null 2>&1; then
+ USE_HOST_XCODE=1
+ else
+ USE_HOST_XCODE=0
+ fi
+fi
+
+if [[ "$USE_HOST_XCODE" == "1" ]]; then
+ FLAKE_REF=".#host-xcode"
+else
+ FLAKE_REF="."
+fi
+
+use flake "$FLAKE_REF"
diff --git a/crates/legacy/cli-tools/src/types/command.rs b/crates/legacy/cli-tools/src/types/command.rs
index 08a62d4e4..ad4341599 100644
--- a/crates/legacy/cli-tools/src/types/command.rs
+++ b/crates/legacy/cli-tools/src/types/command.rs
@@ -407,6 +407,7 @@ impl Command {
.with_arguments(vec!["--target".to_string(), target])
.with_argument("--no-default-features")
.with_arguments(vec!["--features".to_string(), features.join(",")])
+ .with_argument("--skip-toolchains-check")
.with_argument("-y");
command = match configuration {
Configuration::Debug => command,
diff --git a/flake.nix b/flake.nix
index 365dc5e38..2e593803f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,8 +23,13 @@
overlays = [(import rust-overlay)];
};
- rustToolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
- craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
+ rustToolchainNixCC = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+ rustToolchainHostCC = rustToolchainNixCC.overrideAttrs (_: {
+ depsHostHostPropagated = [];
+ propagatedBuildInputs = [];
+ depsTargetTargetPropagated = [];
+ });
+ craneLibNixCC = (crane.mkLib pkgs).overrideToolchain rustToolchainNixCC;
aar-extract = pkgs.ipsw.overrideAttrs (old: {
pname = "aar-extract";
@@ -95,10 +100,31 @@
};
};
- buildInputs = with pkgs; (lib.optionals pkgs.stdenv.hostPlatform.isLinux [alsa-lib]) ++ (lib.optionals pkgs.stdenv.hostPlatform.isDarwin [apple-sdk_26]);
- nativeBuildInputs = with pkgs; [cmake] ++ (lib.optionals pkgs.stdenv.hostPlatform.isLinux [pkg-config]) ++ (lib.optionals pkgs.stdenv.hostPlatform.isDarwin [metal-toolchain]);
+ hostToolchainBuildInputs = with pkgs; (lib.optionals stdenv.hostPlatform.isLinux [alsa-lib]);
+ nixToolchainBuildInputs = hostToolchainBuildInputs ++ (with pkgs; lib.optionals stdenv.hostPlatform.isDarwin [apple-sdk_26]);
+
+ hostToolchainNativeBuildInputs = with pkgs; [cmake] ++ (lib.optionals stdenv.hostPlatform.isLinux [pkg-config]);
+ nixToolchainNativeBuildInputs = hostToolchainNativeBuildInputs ++ (with pkgs; lib.optionals stdenv.hostPlatform.isDarwin [metal-toolchain]);
- mirai = craneLib.buildPackage {
+ commonDevshellPackages = with pkgs;
+ [
+ nil
+ uv
+ wasmtime
+ evcxr
+ cargo-deny
+ cargo-nextest
+ cargo-hack
+ cargo-expand
+ cargo-flamegraph
+ cargo-show-asm
+ critcmp
+ ]
+ ++ (with pkgs; lib.optionals stdenv.hostPlatform.isDarwin [cargo-swift tuist]);
+ hostToolchainDevshellPackages = commonDevshellPackages ++ [rustToolchainHostCC];
+ nixToolchainDevshellPackages = commonDevshellPackages ++ [rustToolchainNixCC];
+
+ mirai = craneLibNixCC.buildPackage {
pname = "mirai";
src = ./.;
@@ -108,7 +134,8 @@
install -Dm755 target/release/cli $out/bin/mirai
'';
- inherit buildInputs nativeBuildInputs;
+ buildInputs = nixToolchainBuildInputs;
+ nativeBuildInputs = nixToolchainNativeBuildInputs;
doCheck = false;
};
@@ -120,23 +147,22 @@
default = mirai;
};
- devShells.default = pkgs.mkShell {
- inherit buildInputs nativeBuildInputs;
+ devShells = {
+ default = pkgs.mkShell {
+ buildInputs = nixToolchainBuildInputs;
+ nativeBuildInputs = nixToolchainNativeBuildInputs;
- packages = with pkgs; [
- nil
- uv
- wasmtime
- evcxr
- rustToolchain
- cargo-deny
- cargo-nextest
- cargo-hack
- cargo-expand
- cargo-flamegraph
- cargo-show-asm
- critcmp
- ];
+ packages = nixToolchainDevshellPackages;
+ };
+
+ host-xcode = pkgs.mkShellNoCC {
+ buildInputs = hostToolchainBuildInputs;
+ nativeBuildInputs = hostToolchainNativeBuildInputs;
+
+ packages = hostToolchainDevshellPackages;
+
+ TUIST_GENERATE_OPEN = "false";
+ };
};
}
);