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}