nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

buildFHSEnv: use LOCALE_ARCHIVE from environment if present

Browse Source 
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
This commit is contained in:
Atemu 2024-11-10 04:06:49 +01:00
parent 4aa36568d4
commit a59e625bb4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
View File

@ -87,7 +87,7 @@ let
destination = "/etc/profile"; destination = "/etc/profile";
text = '' text = ''
export PS1='${name}-fhsenv:\u@\h:\w\$ ' 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 PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH"
export TZDIR='/etc/zoneinfo' export TZDIR='/etc/zoneinfo'