diff options
| author | frenetic00 <50942055+frenetic00@users.noreply.github.com> | 2025-07-03 14:40:10 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2025-08-02 16:37:23 +0200 |
| commit | 591935a0ec5fd18c70f32433b0f8834014c50121 (patch) | |
| tree | 493ca7ca65010ec006d189f83a7f6aa0a6e6a126 | |
| parent | Merge: element-{web-unwrapped,desktop}: 1.11.106 -> 1.11.108 (#429422) (diff) | |
| download | nixpkgs-591935a0ec5fd18c70f32433b0f8834014c50121.tar.gz | |
platformio-core: add missing dependencies and adjust path environment variable
| -rw-r--r-- | pkgs/development/embedded/platformio/builder-prioritize-python-env-in-path.patch | 11 | ||||
| -rw-r--r-- | pkgs/development/embedded/platformio/core.nix | 12 |
2 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/development/embedded/platformio/builder-prioritize-python-env-in-path.patch b/pkgs/development/embedded/platformio/builder-prioritize-python-env-in-path.patch new file mode 100644 index 000000000000..f9e60ce91a20 --- /dev/null +++ b/pkgs/development/embedded/platformio/builder-prioritize-python-env-in-path.patch @@ -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", diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index e4dfae81386d..541c119f3051 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { patches = [ (replaceVars ./interpreter.patch { - interpreter = (python3Packages.python.withPackages (_: propagatedBuildInputs)).interpreter; + interpreter = (python3Packages.python.withPackages (_: dependencies)).interpreter; }) (replaceVars ./use-local-spdx-license-list.patch { spdx_license_list_data = spdx-license-list-data.json; @@ -45,6 +45,7 @@ buildPythonApplication rec { hash = "sha256-yq+/QHCkhAkFND11MbKFiiWT3oF1cHhgWj5JkYjwuY0="; revert = true; }) + ./builder-prioritize-python-env-in-path.patch ]; postPatch = '' @@ -57,13 +58,14 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles - setuptools udevCheckHook ]; + build-system = [ setuptools ]; + pythonRelaxDeps = true; - propagatedBuildInputs = [ + dependencies = [ aiofiles ajsonrpc bottle @@ -71,10 +73,13 @@ buildPythonApplication rec { click-completion colorama git + intelhex lockfile marshmallow + pip pyelftools pyserial + pyyaml requests semantic-version setuptools @@ -82,6 +87,7 @@ buildPythonApplication rec { starlette tabulate uvicorn + wheel wsproto zeroconf ] |