Skip to content

Commit a59e625

Browse files
committed
buildFHSEnv: use LOCALE_ARCHIVE from environment if present
If the environment provides the variable (as NixOS does when the i18n option is set), keep it rather than overriding unconditionally. Fixes #354887
1 parent 4aa3656 commit a59e625

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ let
8787
destination = "/etc/profile";
8888
text = ''
8989
export PS1='${name}-fhsenv:\u@\h:\w\$ '
90-
export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
90+
export LOCALE_ARCHIVE="''${LOCALE_ARCHIVE:-/usr/lib/locale/locale-archive}"
9191
export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH"
9292
export TZDIR='/etc/zoneinfo'
9393

0 commit comments

Comments
 (0)