diff --git a/artiq/artiq-board.nix b/artiq/artiq-board.nix index 8e1e5af..f30ddbe 100644 --- a/artiq/artiq-board.nix +++ b/artiq/artiq-board.nix @@ -2,7 +2,10 @@ # nix.sandboxPaths = ["/opt"]; { pkgs ? import {}}: -{ target, variant, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}" }: +{ target +, variant +, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}" +, extraInstallCommands ? ""}: let fetchcargo = import ./fetchcargo.nix { @@ -60,5 +63,6 @@ in pkgs.python3Packages.buildPythonPackage rec { then cp artiq_${target}/${variant}/software/runtime/runtime.{elf,fbi} $TARGET_DIR else cp artiq_${target}/${variant}/software/satman/satman.{elf,fbi} $TARGET_DIR fi + ${extraInstallCommands} ''; } diff --git a/sinara-systems.nix b/sinara-systems.nix index 958a922..6eb90d6 100644 --- a/sinara-systems.nix +++ b/sinara-systems.nix @@ -44,6 +44,7 @@ let target = "sayma"; variant = "satellite"; buildCommand = "python -m artiq.gateware.targets.sayma_rtm && python -m artiq.gateware.targets.sayma_amc -V satellite"; + extraInstallCommands = "cp artiq_sayma/rtm_gateware/rtm.bit $TARGET_DIR"; }; } EOF