artiq-board: fix scope of toPythonModule
This commit is contained in:
parent
85c4719f33
commit
04fde975ee
|
@ -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}" ];
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue