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

---
 zynq.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/zynq.nix b/zynq.nix
index 39bc076..7e64ea4 100644
--- a/zynq.nix
+++ b/zynq.nix
@@ -1,8 +1,9 @@
 let
+  pkgs = import <nixpkgs> {};
   zynq-rs-latest = import <zynq-rs>;
   artiq-zynq = import <artiq-zynq>;
   zynq-rs = import "${artiq-zynq}/zynq-rs.nix";
-  pkgs = import <nixpkgs> {};
+  zc706-szl = (import zynq-rs).zc706-szl;
   artiq-fast = import <artiq-fast> { inherit pkgs; };
 in
   (
@@ -40,8 +41,8 @@ in
         echo Power cycle done.
 
         export USER=hydra
-        export OPENOCD_ZYNQ=${<zynq-rs>}/openocd
-        export SZL=${zynq-rs.zc706-szl}/szl.elf
+        export OPENOCD_ZYNQ=${zynq-rs}/openocd
+        export SZL=${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