From 56959775319f640fc062f78dc10783e597c2239f Mon Sep 17 00:00:00 2001
From: Stephan Maka <stephan@spaceboyz.net>
Date: Wed, 25 Nov 2020 21:23:03 +0100
Subject: [PATCH] Revert "artiq-board.nix: move compilers into
 nativeBuildInputs"

This reverts commit fd25af0733e4e97924b01c5f40b25fb16b100587.
---
 artiq-fast/artiq-board.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/artiq-fast/artiq-board.nix b/artiq-fast/artiq-board.nix
index f11f6ae..789d15a 100644
--- a/artiq-fast/artiq-board.nix
+++ b/artiq-fast/artiq-board.nix
@@ -56,18 +56,15 @@ pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec {
   version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
   inherit src;
   phases = [ "buildPhase" "installCheckPhase" "installPhase" "checkPhase" ];
-  nativeBuildInputs = [
+  buildInputs = [
     vivado
     pkgs.gnumake
+    (pkgs.python3.withPackages(ps: with ps; [ jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq ]))
     artiqpkgs.cargo
     artiqpkgs.rustc
     artiqpkgs.binutils-or1k
     artiqpkgs.llvm-or1k
   ];
-  buildInputs =
-    [ (pkgs.python3.withPackages (ps: with ps; [
-    jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq
-  ])) ];
   buildPhase = 
     ''
     export CARGO_HOME=${cargoVendored}