From a59e625bb474cd2f8cd2e5bdacac099d0da16c00 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 10 Nov 2024 04:06:49 +0100 Subject: [PATCH] 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 https://github.com/NixOS/nixpkgs/issues/354887 --- pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 291af512a411..dc8ee68e8783 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -87,7 +87,7 @@ let destination = "/etc/profile"; text = '' export PS1='${name}-fhsenv:\u@\h:\w\$ ' - export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' + export LOCALE_ARCHIVE="''${LOCALE_ARCHIVE:-/usr/lib/locale/locale-archive}" export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo'