M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

artiq-fast: build gateware from a self-contained separate source derivation #23

Merged
sb10q merged 6 commits from split-software-gateware-builds into master 2020-12-02 17:22:55 +08:00
Conversation 18 Commits 6 Files Changed 5 +8 -7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 04fde975ee - Show all commits

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

@ -55,7 +55,7 @@ let
boardModule =
# Board packages are Python modules so that they get added to the ARTIQ Python
# environment, and artiq_flash finds them.
pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation {
pkgs.stdenv.mkDerivation {
name = "${name}-firmware";
inherit version src;
phases = [ "buildPhase" "installCheckPhase" "installPhase" "checkPhase" ];
@ -91,7 +91,7 @@ let
fi
${extraInstallCommands}
'';
});
};
identifierStr = "${version};${variant}";
identifiers = import (
@ -180,8 +180,9 @@ let
'';
};
in
pkgs.buildEnv rec {
inherit name;
paths = [ boardModule vivadoOutput ];
pathsToLink = [ "/${installPath}" ];
}
pkgs.python3Packages.toPythonModule (
pkgs.buildEnv rec {
inherit name;
paths = [ boardModule vivadoOutput ];
pathsToLink = [ "/${installPath}" ];
})