diff --git a/artiq-fast/artiq-board.nix b/artiq-fast/artiq-board.nix
index 789d15a..ac591af 100644
--- a/artiq-fast/artiq-board.nix
+++ b/artiq-fast/artiq-board.nix
@@ -56,15 +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" ];
-  buildInputs = [
+  nativeBuildInputs = [
     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}
diff --git a/artiq-fast/fetchcargo.nix b/artiq-fast/fetchcargo.nix
index 6195a72..498821d 100644
--- a/artiq-fast/fetchcargo.nix
+++ b/artiq-fast/fetchcargo.nix
@@ -2,6 +2,7 @@
 { name, src, sha256 }:
 stdenv.mkDerivation {
   name = "${name}-vendor";
+  strictDeps = true;
   nativeBuildInputs = [ cacert git cargo cargo-vendor ];
   inherit src;