From 864bddd0b4c7ce419ff8b242280425044ed521ad Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 9 Sep 2020 19:26:22 +0800
Subject: [PATCH] zynq: fix previous commit

---
 zynq.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/zynq.nix b/zynq.nix
index 379ce52..58856af 100644
--- a/zynq.nix
+++ b/zynq.nix
@@ -2,8 +2,6 @@ let
   pkgs = import <nixpkgs> {};
   zynq-rs-latest = import <zynq-rs>;
   artiq-zynq = import <artiq-zynq>;
-  zynq-rs = import artiq-zynq.zynq-rs;
-  zc706-szl = (import zynq-rs).zc706-szl;
   artiq-fast = import <artiq-fast> { inherit pkgs; };
 in
   (
@@ -41,8 +39,8 @@ in
         echo Power cycle done.
 
         export USER=hydra
-        export OPENOCD_ZYNQ=${zynq-rs}/openocd
-        export SZL=${zc706-szl}/szl.elf
+        export OPENOCD_ZYNQ=${artiq-zynq.zynq-rs}/openocd
+        export SZL=${(import artiq-zynq.zynq-rs).zc706-szl}/szl.elf
         pushd ${<artiq-zynq>}
         bash ${<artiq-zynq>}/remote_run.sh -h rpi-4 -o "-F /dev/null -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -i /opt/hydra_id_rsa" -d ${artiq-zynq.zc706-nist_qc2-jtag}
         popd