platformio-core: add missing dependencies and adjust path environment variable
This commit is contained in:
parent
46838e7124
commit
591935a0ec
@ -0,0 +1,11 @@
|
|||||||
|
--- a/platformio/builder/main.py
|
||||||
|
+++ b/platformio/builder/main.py
|
||||||
|
@@ -46,6 +46,8 @@ clivars.AddVariables(
|
||||||
|
("PROGRAM_ARGS",),
|
||||||
|
)
|
||||||
|
|
||||||
|
+os.environ["PATH"] = os.pathsep.join([os.path.dirname(get_pythonexe_path()), os.environ.get("PATH")])
|
||||||
|
+
|
||||||
|
DEFAULT_ENV_OPTIONS = dict(
|
||||||
|
tools=[
|
||||||
|
"ar",
|
@ -32,7 +32,7 @@ buildPythonApplication rec {
|
|||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
(replaceVars ./interpreter.patch {
|
(replaceVars ./interpreter.patch {
|
||||||
interpreter = (python3Packages.python.withPackages (_: propagatedBuildInputs)).interpreter;
|
interpreter = (python3Packages.python.withPackages (_: dependencies)).interpreter;
|
||||||
})
|
})
|
||||||
(replaceVars ./use-local-spdx-license-list.patch {
|
(replaceVars ./use-local-spdx-license-list.patch {
|
||||||
spdx_license_list_data = spdx-license-list-data.json;
|
spdx_license_list_data = spdx-license-list-data.json;
|
||||||
@ -45,6 +45,7 @@ buildPythonApplication rec {
|
|||||||
hash = "sha256-yq+/QHCkhAkFND11MbKFiiWT3oF1cHhgWj5JkYjwuY0=";
|
hash = "sha256-yq+/QHCkhAkFND11MbKFiiWT3oF1cHhgWj5JkYjwuY0=";
|
||||||
revert = true;
|
revert = true;
|
||||||
})
|
})
|
||||||
|
./builder-prioritize-python-env-in-path.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
@ -57,13 +58,14 @@ buildPythonApplication rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
installShellFiles
|
installShellFiles
|
||||||
setuptools
|
|
||||||
udevCheckHook
|
udevCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
build-system = [ setuptools ];
|
||||||
|
|
||||||
pythonRelaxDeps = true;
|
pythonRelaxDeps = true;
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
dependencies = [
|
||||||
aiofiles
|
aiofiles
|
||||||
ajsonrpc
|
ajsonrpc
|
||||||
bottle
|
bottle
|
||||||
@ -71,10 +73,13 @@ buildPythonApplication rec {
|
|||||||
click-completion
|
click-completion
|
||||||
colorama
|
colorama
|
||||||
git
|
git
|
||||||
|
intelhex
|
||||||
lockfile
|
lockfile
|
||||||
marshmallow
|
marshmallow
|
||||||
|
pip
|
||||||
pyelftools
|
pyelftools
|
||||||
pyserial
|
pyserial
|
||||||
|
pyyaml
|
||||||
requests
|
requests
|
||||||
semantic-version
|
semantic-version
|
||||||
setuptools
|
setuptools
|
||||||
@ -82,6 +87,7 @@ buildPythonApplication rec {
|
|||||||
starlette
|
starlette
|
||||||
tabulate
|
tabulate
|
||||||
uvicorn
|
uvicorn
|
||||||
|
wheel
|
||||||
wsproto
|
wsproto
|
||||||
zeroconf
|
zeroconf
|
||||||
]
|
]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user