astro/nix-scripts
1
0
Fork 0
forked from M-Labs/nix-scripts
Code Issues Pull Requests Releases Wiki Activity

artiq-board: move inputs outside inner function

Browse Source
This commit is contained in:
Astro 2020-06-17 22:15:11 +02:00
parent f5429f28ae
commit b876be5ef9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artiq-fast/artiq-board.nix
View File

@ -1,13 +1,11 @@
# Install Vivado in /opt and add to /etc/nixos/configuration.nix: # Install Vivado in /opt and add to /etc/nixos/configuration.nix:
# nix.sandboxPaths = ["/opt"]; # nix.sandboxPaths = ["/opt"];
{ pkgs }: { pkgs
{ target }:
, variant
, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}"
, extraInstallCommands ? ""}:
let let
vivado = builtins.trace "vivado" (import ./vivado.nix { inherit pkgs; });
artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; }; artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
artiqpkgs = builtins.trace "artiqpkgs" (import ./default.nix { inherit pkgs; }); artiqpkgs = builtins.trace "artiqpkgs" (import ./default.nix { inherit pkgs; });
fetchcargo = import ./fetchcargo.nix { fetchcargo = import ./fetchcargo.nix {
@ -44,8 +42,13 @@ let
''; '';
}; };
vivado = builtins.trace "vivado" (import ./vivado.nix { inherit pkgs; }); in
{ target
, variant
, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}"
, extraInstallCommands ? ""}:
let
# Board packages are Python modules so that they get added to the ARTIQ Python # Board packages are Python modules so that they get added to the ARTIQ Python
# environment, and artiq_flash finds them. # environment, and artiq_flash finds them.
in pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec { in pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec {