0xmovses/flake

m1/.cargo/config.toml

@@ -1,33 +1,2 @@
-[alias]
-xclippy = [
-  "clippy",
-  "--workspace",
-  "--all-targets",
-  "--",
-  "-Dwarnings",
-  "-Wclippy::all",
-  "-Aclippy::upper_case_acronyms",
-  "-Aclippy::enum-variant-names",
-  "-Aclippy::result-large-err",
-  "-Aclippy::mutable-key-type",
-]
-
 [build]
-rustflags = ["--cfg", "tokio_unstable", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes"]
-
-# TODO(grao): Figure out whether we should enable other cpu features, and whether we should use a different way to configure them rather than list every single one here.
-[target.x86_64-unknown-linux-gnu]
-rustflags = ["--cfg", "tokio_unstable", "-C", "link-arg=-fuse-ld=lld", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes", "-C", "target-feature=+sse4.2"]
-
-# 64 bit MSVC
-[target.x86_64-pc-windows-msvc]
-rustflags = [
-  "--cfg",
-  "tokio_unstable",
-  "-C",
-  "force-frame-pointers=yes",
-  "-C",
-  "force-unwind-tables=yes",
-  "-C",
-  "link-arg=/STACK:8000000" # Set stack to 8 MB
-]
+rustflags = ["--cfg", "tokio_unstable"]

m1/flake.nix

@@ -0,0 +1,56 @@
+{
+  description = "A devShell example";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    rust-overlay.url = "github:oxalica/rust-overlay";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }@inputs:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        overlays = [ (import rust-overlay) ];
+        pkgs = import nixpkgs {
+          inherit system overlays;
+        };
+        darwinFrameworks = if system == "x86_64-darwin" then with pkgs.darwin.apple_sdk.frameworks; [
+          IOKit
+          SystemConfiguration
+          AppKit
+        ] else [];
+      in
+      with pkgs;
+      {
+        devShells.default = mkShell {
+          buildInputs = [
+            pkgs.clang_14
+            zlib
+            bzip2
+            lz4
+            snappy
+            zstd
+            rocksdb
+            openssl
+            pkg-config
+            eza
+            fd
+            rust-bin.beta.latest.default
+          ] ++ darwinFrameworks;
+
+          shellHook = ''
+            alias ls=eza
+            alias find=fd
+
+            echo "> Entered Nix-powered M1 simulator environment"
+            export OLD_PS1="$PS1"
+            PS1="(M1-nix) $PS1"
+
+            # Set MACOSX_DEPLOYMENT_TARGET for compatibility
+            export MACOSX_DEPLOYMENT_TARGET="10.13"
+            echo "MACOSX_DEPLOYMENT_TARGET set to: $MACOSX_DEPLOYMENT_TARGET"
+          '';
+        };
+      }
+    );
+}

m1/scripts/simulator.sh

@@ -1,7 +1,4 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash
-
-# Dummy function placeholders for actual commands that would be implemented
+# run nix develop then call this script 
 
 init_env() {
     echo "Initializing Environment"