From b80f42d48a2ce16c7be9fa14ccd277986167aeb3 Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Sun, 4 Sep 2022 03:46:28 +0200 Subject: [PATCH] packages: get_makepkg_env(): don't use host env, but provide standard PATH variable --- packages/build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/build.py b/packages/build.py index 6b99cef..97c39c3 100644 --- a/packages/build.py +++ b/packages/build.py @@ -32,11 +32,12 @@ pacman_cmd = [ def get_makepkg_env(arch: Optional[Arch] = None): # has to be a function because calls to `config` must be done after config file was read threads = config.file.build.threads or multiprocessing.cpu_count() - env = {key: val for key, val in os.environ.items() if not key.split('_', maxsplit=1)[0] in ['CI', 'GITLAB', 'FF']} - env |= { + # env = {key: val for key, val in os.environ.items() if not key.split('_', maxsplit=1)[0] in ['CI', 'GITLAB', 'FF']} + env = { 'LANG': 'C', 'CARGO_BUILD_JOBS': str(threads), 'MAKEFLAGS': f"-j{threads}", + 'PATH': '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } native = config.runtime.arch assert native