From ee611c5c30d8fca46046f5db9a34d47108955bfb Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 9 Feb 2019 15:07:16 +0800
Subject: [PATCH] nix: build gateware

---
 nix/artiq-board.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nix/artiq-board.nix b/nix/artiq-board.nix
index 791ee66d2..020ddaece 100644
--- a/nix/artiq-board.nix
+++ b/nix/artiq-board.nix
@@ -1,3 +1,6 @@
+# Install Vivado in /opt and add to /etc/nixos/configuration.nix:
+#  nix.sandboxPaths = ["/opt"];
+
 { pkgs ? import <nixpkgs> {}}:
 
 let
@@ -43,12 +46,12 @@ in pkgs.stdenv.mkDerivation {
   phases = [ "buildPhase" "installPhase" ];
   buildPhase = 
     ''
-    ${buildenv}/bin/artiq-dev -c "CARGO_HOME=${cargoVendored} python -m artiq.gateware.targets.kasli -V tester --no-compile-gateware"
+    ${buildenv}/bin/artiq-dev -c "CARGO_HOME=${cargoVendored} python -m artiq.gateware.targets.kasli -V tester"
     '';
   installPhase =
     ''
     mkdir $out
-    #cp artiq_kasli/tester/gateware/top.bit $out
+    cp artiq_kasli/tester/gateware/top.bit $out
     cp artiq_kasli/tester/software/bootloader/bootloader.bin $out
     cp artiq_kasli/tester/software/runtime/runtime.{elf,fbi} $out
     '';