From de7c867866e317cd5d58c36cab76dfdb48dd5bdf Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 9 Sep 2020 19:23:53 +0800
Subject: [PATCH] zynq: use exposed zynq-rs from artiq-zynq

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

diff --git a/zynq.nix b/zynq.nix
index febdd3f..379ce52 100644
--- a/zynq.nix
+++ b/zynq.nix
@@ -2,6 +2,8 @@ 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
   (
@@ -21,10 +23,7 @@ in
         touch $out
         '';
     });
-    zc706-hitl-tests = pkgs.lib.hydraJob (let
-      zynq-rs = import "${<artiq-zynq>}/zynq-rs.nix";
-      zc706-szl = (import zynq-rs).zc706-szl;
-    in pkgs.stdenv.mkDerivation {
+    zc706-hitl-tests = pkgs.lib.hydraJob (pkgs.stdenv.mkDerivation {
       name = "zc706-hitl-tests";
 
       # requires patched Nix