From c54a45ce820a4afcbfa3c3af317b3109a063486e Mon Sep 17 00:00:00 2001
From: Byron Wasti <byron.wasti@gmail.com>
Date: Sat, 3 Feb 2024 12:28:10 -0500
Subject: [PATCH] Fix Nixos Rust toolchain issues

Unfortunately Rust is a bit of a headache in Nixos. Previously this
project used the default nixpkgs rustc/cargo packages, but they're a few
versions out of date. This commit switches to using the installation via
Rustup with a pinned toolchain (https://nixos.wiki/wiki/Rust).
---
 rust-toolchain.toml |  3 +++
 shell.nix           | 56 ++++++++++++++++++++++++++++++++-------------
 2 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 rust-toolchain.toml

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000..61f6194
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel="1.75.0"
+components = ["rustfmt", "clippy", "rust-analyzer"]
diff --git a/shell.nix b/shell.nix
index 1a7cfaf..97d878b 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,20 +1,44 @@
 { pkgs ? import <nixpkgs> {} }:
 with pkgs;
-mkShell {
-  nativeBuildInputs = [
-    bintools-unwrapped
-    just
-    fastmod
-    glibc
-    cpulimit
-    rustc
-    cargo
-    gcc
-    rustfmt
-    clippy
-    linuxPackages_latest.perf
-    hyperfine
-  ];
+mkShell rec {
+    buildInputs = with pkgs; [
+      clang
+      # Replace llvmPackages with llvmPackages_X, where X is the latest LLVM version (at the time of writing, 16)
+      llvmPackages.bintools
+      # bintools-unwrapped
+      rustup
+      just
+      fastmod
+      glibc
+      cpulimit
+      gcc
+      clippy
+      linuxPackages_latest.perf
+      hyperfine
+    ];
 
-  RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
+    RUSTC_VERSION = pkgs.lib.readFile ./rust-toolchain.toml;
+    # https://github.com/rust-lang/rust-bindgen#environment-variables
+    LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.llvmPackages_latest.libclang.lib ];
+    shellHook = ''
+      export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin
+      export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-x86_64-unknown-linux-gnu/bin/
+      '';
+    # Add precompiled library to rustc search path
+    RUSTFLAGS = (builtins.map (a: ''-L ${a}/lib'') [
+      # add libraries here (e.g. pkgs.libvmi)
+    ]);
+    # Add glibc, clang, glib and other headers to bindgen search path
+    BINDGEN_EXTRA_CLANG_ARGS =
+        # Includes with normal include path
+        (builtins.map (a: ''-I"${a}/include"'') [
+          # add dev libraries here (e.g. pkgs.libvmi.dev)
+          pkgs.glibc.dev
+        ])
+        # Includes with special directory paths
+        ++ [
+          ''-I"${pkgs.llvmPackages_latest.libclang.lib}/lib/clang/${pkgs.llvmPackages_latest.libclang.version}/include"''
+          ''-I"${pkgs.glib.dev}/include/glib-2.0"''
+          ''-I${pkgs.glib.out}/lib/glib-2.0/include/''
+        ];
 }