den512
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

follow changes in zynq-rs

This commit is contained in:
Astro 2021-01-15 01:02:15 +01:00
parent e5207b86db
commit a5ccabb8e6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -30,7 +30,7 @@ let
pkgs.llvmPackages_9.clang-unwrapped pkgs.llvmPackages_9.clang-unwrapped
]; ];
buildPhase = '' buildPhase = ''
export XARGO_RUST_SRC="${rustPlatform.rust.rustc.src}/library" export XARGO_RUST_SRC="${rustPlatform.rust.rustc}/lib/rustlib/src/rust/library"
export CARGO_HOME=$(mktemp -d cargo-home.XXX) export CARGO_HOME=$(mktemp -d cargo-home.XXX)
make TARGET=${target} VARIANT=${variant} make TARGET=${target} VARIANT=${variant}
''; '';

2
shell.nix
View File

@ -29,7 +29,7 @@ in
(import "${zynq-rs}/nix/mkbootimage.nix" { inherit pkgs; }) (import "${zynq-rs}/nix/mkbootimage.nix" { inherit pkgs; })
]; ];
XARGO_RUST_SRC = "${rustPlatform.rust.rustc.src}/library"; XARGO_RUST_SRC = "${rustPlatform.rust.rustc}/lib/rustlib/src/rust/library";
OPENOCD_ZYNQ = "${zynq-rs}/openocd"; OPENOCD_ZYNQ = "${zynq-rs}/openocd";
SZL = "${zc706-szl}/szl.elf"; SZL = "${zc706-szl}/szl.elf";
} }

4
zynq-rs.nix
View File

@ -3,6 +3,6 @@ let
in in
pkgs.fetchgit { pkgs.fetchgit {
url = "https://git.m-labs.hk/M-Labs/zynq-rs.git"; url = "https://git.m-labs.hk/M-Labs/zynq-rs.git";
rev = "966e43e14ed26e883a2de03d56cedde964283269"; rev = "b4d91e7904423b6477eb1f25b8cc3940e197e9c2";
sha256 = "15lfvc5dwx3qvkba10p0fjx2dzgsyk57ivp4izwg2dhwdcnikk6j"; sha256 = "0g77s9jmbyxzkpnn2rs2sya5ia2admgkn74kzl2h1n4nckfk2nn6";
} }