Use fenix toolchain in nix shell (#18227)

In #17974 we explicitly depend on rustc/cargo for the nix devShell,
however the fenix overlay that contains the latest stable versions was
not being applied to that shell. This led to the shell inheriting
whatever rustc/cargo was on nixos-unstable from nixpkgs, which sometimes
lags behind. This change fixes that, and also restructures the flake to
ensure that all outputs rely on the overlaid `pkgs`.

Release Notes:

- N/A
This commit is contained in:
jvmncs 2024-09-23 10:16:15 -04:00 committed by GitHub
parent d784e72027
commit 2ff8dde925
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 41 additions and 38 deletions

View file

@ -20,8 +20,7 @@ in
wayland
xorg.libxcb
vulkan-loader
rustc
cargo
rustToolchain
];
in
pkgs.mkShell.override {inherit stdenv;} {