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

artiq-board: fix scope of toPythonModule

This commit is contained in:
Astro 2020-11-29 19:27:51 +01:00
parent 85c4719f33
commit 04fde975ee
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ let
boardModule = boardModule =
# 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.
pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "${name}-firmware"; name = "${name}-firmware";
inherit version src; inherit version src;
phases = [ "buildPhase" "installCheckPhase" "installPhase" "checkPhase" ]; phases = [ "buildPhase" "installCheckPhase" "installPhase" "checkPhase" ];
@ -91,7 +91,7 @@ let
fi fi
${extraInstallCommands} ${extraInstallCommands}
''; '';
}); };
identifierStr = "${version};${variant}"; identifierStr = "${version};${variant}";
identifiers = import ( identifiers = import (
@ -180,8 +180,9 @@ let
''; '';
}; };
in in
pkgs.buildEnv rec { pkgs.python3Packages.toPythonModule (
inherit name; pkgs.buildEnv rec {
paths = [ boardModule vivadoOutput ]; inherit name;
pathsToLink = [ "/${installPath}" ]; paths = [ boardModule vivadoOutput ];
} pathsToLink = [ "/${installPath}" ];
})