From 12fbe646167aecb37452b595396d7c4f0d7b94a6 Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Thu, 26 Nov 2020 17:09:40 +0100 Subject: [PATCH] artiq-fast: add strictDeps=true to fetchcargo.nix, nativeBuildInputs to artiq-board.nix this indeed cuts runtime dependencies (gitea issue #34) --- artiq-fast/artiq-board.nix | 4 ++-- artiq-fast/fetchcargo.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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;