File tree Expand file tree Collapse file tree 2 files changed +5
-37
lines changed Expand file tree Collapse file tree 2 files changed +5
-37
lines changed Original file line number Diff line number Diff line change 1
1
{ pkgs , lib , ... } :
2
2
let
3
- wrap-rust = pkgs . callPackage ./wrap-rust.nix { } ;
4
3
setup-xdg-cargo-home = pkgs . writeShellApplication {
5
4
name = "setup-xdg-cargo-home" ;
6
5
text = lib . readFile ./setup-xdg-cargo-home ;
40
39
}
41
40
) ) ,
42
41
custom ? true ,
43
- } : pkgs . mkShell {
42
+ } : let
43
+ version = lib . lists . head ( lib . strings . split "-" rust-toolchain . version ) ;
44
+ in pkgs . mkShell {
44
45
buildInputs = with pkgs ; [
45
46
# Rust itself
46
- ( if custom then ( wrap- rust rust -toolchain) else rust-toolchain )
47
+ rust-toolchain
47
48
48
49
# Dev utilities
49
50
bacon
130
131
131
132
# Some crates disable nightly feature detection when this is set
132
133
export RUSTC_STAGE=1
134
+ export RUSTC_FORCE_RUSTC_VERSION=${ version }
133
135
'' else "" ) ;
134
136
}
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments