From a5ccabb8e62f14ab99173a249c3bb35beb6f011a Mon Sep 17 00:00:00 2001 From: Astro Date: Fri, 15 Jan 2021 01:02:15 +0100 Subject: [PATCH] follow changes in zynq-rs --- default.nix | 2 +- shell.nix | 2 +- zynq-rs.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 0c9e772..e24d354 100644 --- a/default.nix +++ b/default.nix @@ -30,7 +30,7 @@ let pkgs.llvmPackages_9.clang-unwrapped ]; 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) make TARGET=${target} VARIANT=${variant} ''; diff --git a/shell.nix b/shell.nix index cdca26e..e38adaa 100644 --- a/shell.nix +++ b/shell.nix @@ -29,7 +29,7 @@ in (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"; SZL = "${zc706-szl}/szl.elf"; } diff --git a/zynq-rs.nix b/zynq-rs.nix index 93bbad9..2305700 100644 --- a/zynq-rs.nix +++ b/zynq-rs.nix @@ -3,6 +3,6 @@ let in pkgs.fetchgit { url = "https://git.m-labs.hk/M-Labs/zynq-rs.git"; - rev = "966e43e14ed26e883a2de03d56cedde964283269"; - sha256 = "15lfvc5dwx3qvkba10p0fjx2dzgsyk57ivp4izwg2dhwdcnikk6j"; + rev = "b4d91e7904423b6477eb1f25b8cc3940e197e9c2"; + sha256 = "0g77s9jmbyxzkpnn2rs2sya5ia2admgkn74kzl2h1n4nckfk2nn6"; }