forked from M-Labs/nix-scripts
artiq-full: fix artiq-board paths
This commit is contained in:
parent
1c103ccb62
commit
22a6d5fb2e
|
@ -9,6 +9,7 @@ let
|
|||
|
||||
cp -a ${<artiq-fast>} $out/fast
|
||||
cp ${./artiq-full}/artiq-board.nix $out
|
||||
cp ${./artiq-full}/generate-identifier.py $out
|
||||
cp ${./artiq-full}/conda-artiq-board.nix $out
|
||||
cp ${./artiq-full}/extras.nix $out
|
||||
cp ${./artiq-full}/*.patch $out
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
# nix.sandboxPaths = ["/opt"];
|
||||
|
||||
{ pkgs
|
||||
, vivado ? import ./vivado.nix { inherit pkgs; }
|
||||
, vivado ? import ./fast/vivado.nix { inherit pkgs; }
|
||||
}:
|
||||
|
||||
let
|
||||
version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
|
||||
artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
|
||||
artiqpkgs = import ./default.nix { inherit pkgs; };
|
||||
fetchcargo = import ./fetchcargo.nix {
|
||||
version = import ./fast/pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
|
||||
artiqSrc = import ./fast/pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
|
||||
artiqpkgs = import ./fast/default.nix { inherit pkgs; };
|
||||
fetchcargo = import ./fast/fetchcargo.nix {
|
||||
inherit (pkgs) stdenv cacert git;
|
||||
inherit (artiqpkgs) cargo cargo-vendor;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue