From 4bfe5420d3fe4586c87c45534029b8648a07fe40 Mon Sep 17 00:00:00 2001
From: Stephan Maka <stephan@spaceboyz.net>
Date: Wed, 17 Jun 2020 22:21:02 +0200
Subject: [PATCH] artiq-board: let artiq-full pass vivado

---
 artiq-fast/artiq-board.nix | 2 +-
 artiq-full.nix             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/artiq-fast/artiq-board.nix b/artiq-fast/artiq-board.nix
index 3fbf971..51b3e28 100644
--- a/artiq-fast/artiq-board.nix
+++ b/artiq-fast/artiq-board.nix
@@ -2,10 +2,10 @@
 #  nix.sandboxPaths = ["/opt"];
 
 { pkgs
+, vivado ? (builtins.trace "vivado" (import ./vivado.nix { inherit pkgs; }))
 }:
 
 let
-  vivado = builtins.trace "vivado" (import ./vivado.nix { inherit pkgs; });
   artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
   artiqpkgs = builtins.trace "artiqpkgs" (import ./default.nix { inherit pkgs; });
   fetchcargo = import ./fetchcargo.nix {
diff --git a/artiq-full.nix b/artiq-full.nix
index 9177f15..4d2d424 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -100,7 +100,8 @@ let
         "uamsterdam"
       ]);
 
-      artiq-board = builtins.trace "artiq-board" (import ./fast/artiq-board.nix { inherit pkgs; });
+      vivado = builtins.trace "vivado (full)" (import ./vivado.nix { inherit pkgs; });
+      artiq-board = builtins.trace "artiq-board" (import ./fast/artiq-board.nix { inherit pkgs vivado; });
       conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; };
       src = pkgs.fetchgit {
         url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";