actions: use toolchain.toml

Author: onlycs

.cargo/config.toml

@@ -4,7 +4,7 @@ CXXFLAGS = "-O2"
 
 [build]
 rustc-wrapper = "sccache"
-rustflags = ["Z", "threads=16"]
+rustflags = ["-Z", "threads=16"]
 
 [target.x86_64-unknown-linux-gnu]
 linker = "clang"

.github/workflows/web.yml

@@ -28,10 +28,6 @@ jobs:
 
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2024-11-22
-          default: true
-          override: true
 
       - name: Install wasm-pack via apt
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

flake.nix

@@ -7,23 +7,50 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, rust-overlay, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      rust-overlay,
+      flake-utils,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
         overlays = [ (import rust-overlay) ];
         pkgs = import nixpkgs { inherit system overlays; };
 
-        rustToolchain =
-          pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+        rustToolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
 
-        libraries = with pkgs; [ wayland libxkbcommon libGL vulkan-loader vulkan-headers gcc.cc.lib ];
-      in {
+        libraries = with pkgs; [
+          wayland
+          libxkbcommon
+          libGL
+          vulkan-loader
+          vulkan-headers
+          gcc.cc.lib
+          pkgsCross.mingwW64.windows.pthreads
+        ];
+      in
+      {
         devShells.default = pkgs.mkShell {
-          buildInputs = with pkgs;
-            [ rustToolchain pkg-config sccache mold clang ] ++ libraries;
+          buildInputs =
+            with pkgs;
+            [
+              rustToolchain
+              pkg-config
+              sccache
+              mold
+              clang
+              nil
+              pkgsCross.mingwW64.stdenv.cc
+              nixd
+            ]
+            ++ libraries;
           RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library";
           LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libraries;
           PKG_CONFIG_PATH = pkgs.lib.makeSearchPath "lib/pkgconfig" libraries;
         };
-      });
+      }
+    );
 }

rust-toolchain.toml

@@ -1,3 +1,4 @@
 [toolchain]
 channel = "nightly-2025-06-30"
 components = ["rust-src", "rustc-dev", "llvm-tools", "rustc-codegen-cranelift-preview"]
+targets = ["x86_64-pc-windows-gnu"]