Fix "use_default_shell_env = True" for NixOS (higherkindness#284)

timothyklim · web-flow · commit b772564a20ee · 2020-06-03T16:51:50.000-06:00
Co-authored-by: Timothy Klim &lt;git@timothyklim.com&gt;
diff --git a/rules/private/phases/phase_zinc_compile.bzl b/rules/private/phases/phase_zinc_compile.bzl
@@ -89,6 +89,7 @@ def phase_zinc_compile(ctx, g):
         executable = worker.files_to_run.executable,
         input_manifests = input_manifests,
         execution_requirements = _resolve_execution_reqs(ctx, {"no-sandbox": "1", "supports-workers": "1"}),
+        use_default_shell_env = True,
         arguments = [args],
     )
 
diff --git a/rules/private/phases/phase_zinc_depscheck.bzl b/rules/private/phases/phase_zinc_depscheck.bzl
@@ -45,6 +45,7 @@ def phase_zinc_depscheck(ctx, g):
             executable = deps_configuration.worker.files_to_run.executable,
             input_manifests = worker_input_manifests,
             execution_requirements = _resolve_execution_reqs(ctx, {"supports-workers": "1"}),
+            use_default_shell_env = True,
             arguments = [deps_args],
         )
         deps_checks[name] = deps_check

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ def phase_zinc_compile(ctx, g):`
`89`	`89`	`executable = worker.files_to_run.executable,`
`90`	`90`	`input_manifests = input_manifests,`
`91`	`91`	`execution_requirements = _resolve_execution_reqs(ctx, {"no-sandbox": "1", "supports-workers": "1"}),`
	`92`	`+ use_default_shell_env = True,`
`92`	`93`	`arguments = [args],`
`93`	`94`	`)`
`94`	`95`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ def phase_zinc_depscheck(ctx, g):`
`45`	`45`	`executable = deps_configuration.worker.files_to_run.executable,`
`46`	`46`	`input_manifests = worker_input_manifests,`
`47`	`47`	`execution_requirements = _resolve_execution_reqs(ctx, {"supports-workers": "1"}),`
	`48`	`+ use_default_shell_env = True,`
`48`	`49`	`arguments = [deps_args],`
`49`	`50`	`)`
`50`	`51`	`deps_checks[name] = deps_check`