Lillian-Violet/dev-templates
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make Rust env more robust

Browse source
This commit is contained in:
Luc Perkins 2022-07-29 02:29:34 +02:00
parent f6d7e1f56a
commit e566bd0822
No known key found for this signature in database
GPG key ID: 4F102D0C16E232F2
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rust/flake.nix
View file

@ -13,10 +13,16 @@
overlays = [ (import rust-overlay) ]; overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs { inherit system overlays; }; pkgs = import nixpkgs { inherit system overlays; };
inherit (pkgs) rust-bin;
rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; rust = if builtins.pathExists ./rust-toolchain.toml then
rust-bin.fromRustupToolchainFile ./rust-toolchain.toml
else if builtins.pathExists ./rust-toolchain then
rust-bin.fromRustupToolchainFile ./rust-toolchain
else
rust-bin.stable.latest.default;
helpers = with pkgs; [ openssl pkg-config ]; helpers = with pkgs; [ openssl pkgconfig ];
inherit (pkgs) mkShell; inherit (pkgs) mkShell;
inherit (pkgs.lib) optionals; inherit (pkgs.lib) optionals;
@ -26,7 +32,9 @@
devShells = { devShells = {
default = mkShell { default = mkShell {
buildInputs = [ rust ] ++ helpers; nativeBuildInputs = [ rust ];
buildInputs = helpers;
shellHook = '' shellHook = ''
${rust}/bin/cargo --version ${rust}/bin/cargo --version

2
rust/rust-toolchain.toml
View file

@ -1,2 +0,0 @@
[toolchain]
channel = "1.62.0"