esavkin
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

artiq-full: pass rustPlatform to artiq-board

This commit is contained in:
Sebastien Bourdeauducq 2021-09-12 19:00:37 +08:00
parent 70086fbfe0
commit 65e9f77019
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq-full.nix
View File

@ -74,7 +74,7 @@ let
HASH=`nix-hash --type sha256 --base32 $SINARA_SRC_CLEAN` HASH=`nix-hash --type sha256 --base32 $SINARA_SRC_CLEAN`
''} ''}
cat > $out/default.nix << EOF cat > $out/default.nix << EOF
{ pkgs ? import <nixpkgs> {}}: { pkgs ? import <nixpkgs> { overlays = [ (import ./fast/mozilla-overlay.nix) ]; }}:
let let
artiq-fast = import ${if use-generated then "./board-generated" else "."}/fast { inherit pkgs; }; artiq-fast = import ${if use-generated then "./board-generated" else "."}/fast { inherit pkgs; };
@ -107,6 +107,7 @@ let
else '' else ''
import ./fast/artiq-board.nix { import ./fast/artiq-board.nix {
inherit pkgs vivado; inherit pkgs vivado;
rustPlatform = import ./fast/rust-platform.nix { inherit pkgs; };
} }
''}; ''};
conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; }; conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; };