diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs index 9d0c4fa10..82f30e0c6 100644 --- a/build/ninja_gen/src/node.rs +++ b/build/ninja_gen/src/node.rs @@ -372,12 +372,6 @@ impl BuildAction for GenTypescriptProto<'_> { ); build.add_inputs("protoc", inputs![":protoc_binary"]); build.add_inputs("gen-es", inputs![":node_modules:protoc-gen-es"]); - if cfg!(windows) { - build.add_env_var( - "PATH", - &format!("node_modules/.bin;{}", std::env::var("PATH").unwrap()), - ); - } build.add_inputs_vec("in", proto_files); build.add_inputs("", inputs!["yarn.lock"]); build.add_inputs("pyenv_bin", inputs![":pyenv:bin"]); diff --git a/build/runner/src/build.rs b/build/runner/src/build.rs index 7b5f1f599..950a99aec 100644 --- a/build/runner/src/build.rs +++ b/build/runner/src/build.rs @@ -27,7 +27,7 @@ pub fn run_build(args: BuildArgs) { let path = if cfg!(windows) { format!( - "out\\bin;out\\extracted\\node;{};\\msys64\\usr\\bin", + "out\\bin;out\\extracted\\node;node_modules\\.bin;out\\extracted\\win_amd64_audio;{};\\msys64\\usr\\bin", env::var("PATH").unwrap() ) } else { @@ -61,7 +61,7 @@ pub fn run_build(args: BuildArgs) { .arg(&build_file) .args(ninja_args) .env("NINJA_STATUS", "[%f/%t; %r active; %es] ") - .env("PATH", path) + .env("PATH", &path) .env( "MYPY_CACHE_DIR", build_root.join("tests").join("mypy").into_string(), diff --git a/run.bat b/run.bat index c8a1fb306..56ae269f4 100755 --- a/run.bat +++ b/run.bat @@ -5,9 +5,6 @@ set PYTHONWARNINGS=default set PYTHONPYCACHEPREFIX=out\pycache set ANKIDEV=1 -REM put mpv on the path -set PATH=%PATH%;out\extracted\win_amd64_audio - call tools\ninja pylib qt extract:win_amd64_audio || exit /b 1 .\out\pyenv\scripts\python tools\run.py %* || exit /b 1 popd