architeuthis
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Pull Requests Activity

shell.nix: use local channel-rust-nightly.toml 

Cargo won't let us use the Nix-downloaded copy of zc706 (no way to specify source paths from environment variables,
no way to override Cargo config file without overriding the whole CARGO_HOME) so having such a copy just makes
things complex and inconsistent.
This commit is contained in:
Sebastien Bourdeauducq 2020-04-11 19:01:42 +08:00
parent d4f1e22a76
commit 4a171ed29c
2 changed files with 15069 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15068
channel-rust-nightly.toml Normal file
View File

File diff suppressed because it is too large Load Diff

9
shell.nix
View File

@ -11,12 +11,7 @@ let
sha256 = "1hcqdz4w2vqb12rrqqcjbfs5s0w4qwjn7z45d1zh0fzncdcf6f7d"; sha256 = "1hcqdz4w2vqb12rrqqcjbfs5s0w4qwjn7z45d1zh0fzncdcf6f7d";
fetchSubmodules = true; fetchSubmodules = true;
}; };
zc706 = pkgs.fetchgit { rustManifest = ./channel-rust-nightly.toml;
url = "https://git.m-labs.hk/M-Labs/zc706.git";
rev = "526cfe7577c189687ed1fdca512120dd1460bb80";
sha256 = "1gsnggp4237mn9pl6xsvfj859akbsw9w0vmc1i29famz1zzwly76";
};
rustManifest = "${zc706}/channel-rust-nightly.toml";
targets = []; targets = [];
rustChannelOfTargets = _channel: _date: targets: rustChannelOfTargets = _channel: _date: targets:
@ -49,7 +44,5 @@ in
vivado vivado
]; ];
# Set Environment Variables
RUST_BACKTRACE = 1;
XARGO_RUST_SRC = "${rustcSrc}/src"; XARGO_RUST_SRC = "${rustcSrc}/src";
} }