diff --git a/pkg/legacy/rpm.bzl b/pkg/legacy/rpm.bzl index 74f1730e..671198cd 100644 --- a/pkg/legacy/rpm.bzl +++ b/pkg/legacy/rpm.bzl @@ -125,8 +125,8 @@ def _pkg_rpm_impl(ctx): inputs = files, outputs = [ctx.outputs.rpm], env = { - "LANG": "en_US.UTF-8", - "LC_CTYPE": "UTF-8", + "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"), + "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"), "PYTHONIOENCODING": "UTF-8", "PYTHONUTF8": "1", }, diff --git a/pkg/private/deb/deb.bzl b/pkg/private/deb/deb.bzl index 53bc2ebb..792a50ac 100644 --- a/pkg/private/deb/deb.bzl +++ b/pkg/private/deb/deb.bzl @@ -155,8 +155,8 @@ def _pkg_deb_impl(ctx): inputs = files, outputs = [output_file, changes_file], env = { - "LANG": "en_US.UTF-8", - "LC_CTYPE": "UTF-8", + "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"), + "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"), "PYTHONIOENCODING": "UTF-8", "PYTHONUTF8": "1", }, diff --git a/pkg/private/tar/tar.bzl b/pkg/private/tar/tar.bzl index 963cb5a1..79ce9e96 100644 --- a/pkg/private/tar/tar.bzl +++ b/pkg/private/tar/tar.bzl @@ -187,8 +187,8 @@ def _pkg_tar_impl(ctx): arguments = [args], outputs = [output_file], env = { - "LANG": "en_US.UTF-8", - "LC_CTYPE": "UTF-8", + "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"), + "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"), "PYTHONIOENCODING": "UTF-8", "PYTHONUTF8": "1", }, diff --git a/pkg/private/zip/zip.bzl b/pkg/private/zip/zip.bzl index 5531bc26..725e3880 100644 --- a/pkg/private/zip/zip.bzl +++ b/pkg/private/zip/zip.bzl @@ -72,8 +72,8 @@ def _pkg_zip_impl(ctx): arguments = [args], outputs = [output_file], env = { - "LANG": "en_US.UTF-8", - "LC_CTYPE": "UTF-8", + "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"), + "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"), "PYTHONIOENCODING": "UTF-8", "PYTHONUTF8": "1", }, diff --git a/pkg/releasing/git.bzl b/pkg/releasing/git.bzl index 787e75ba..34d63d05 100644 --- a/pkg/releasing/git.bzl +++ b/pkg/releasing/git.bzl @@ -44,8 +44,8 @@ def _git_changelog_impl(ctx): arguments = [args], outputs = [ctx.outputs.out], env = { - "LANG": "en_US.UTF-8", - "LC_CTYPE": "UTF-8", + "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"), + "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"), "PYTHONIOENCODING": "UTF-8", "PYTHONUTF8": "1", }, diff --git a/pkg/rpm_pfg.bzl b/pkg/rpm_pfg.bzl index 90fc800d..0122cb3c 100644 --- a/pkg/rpm_pfg.bzl +++ b/pkg/rpm_pfg.bzl @@ -675,8 +675,8 @@ def _pkg_rpm_impl(ctx): inputs = files, outputs = [output_file], env = { - "LANG": "en_US.UTF-8", - "LC_CTYPE": "UTF-8", + "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"), + "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"), "PYTHONIOENCODING": "UTF-8", "PYTHONUTF8": "1", }, @@ -684,8 +684,8 @@ def _pkg_rpm_impl(ctx): ) changes = [] - if ctx.attr.changelog: - changes = [ctx.attr.changelog] + if ctx.file.changelog: + changes = [ctx.file.changelog] output_groups = { "out": [default_file],