From fd25af0733e4e97924b01c5f40b25fb16b100587 Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Wed, 25 Nov 2020 18:19:03 +0100 Subject: [PATCH] artiq-board.nix: move compilers into nativeBuildInputs Part of Gitea issue #34 --- artiq-fast/artiq-board.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/artiq-fast/artiq-board.nix b/artiq-fast/artiq-board.nix index 789d15a..f11f6ae 100644 --- a/artiq-fast/artiq-board.nix +++ b/artiq-fast/artiq-board.nix @@ -56,15 +56,18 @@ 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}