mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 19:45:54 +00:00
8b311ba757
svn path=/nixpkgs/trunk/; revision=21681
16 lines
554 B
Diff
16 lines
554 B
Diff
diff --git a/session.c b/session.c
|
|
index e032de6..44db2bb 100644
|
|
--- a/session.c
|
|
+++ b/session.c
|
|
@@ -1196,6 +1196,10 @@ do_setup_env(Session *s, const char *shell)
|
|
if (getenv("TZ"))
|
|
child_set_env(&env, &envsize, "TZ", getenv("TZ"));
|
|
|
|
+ /* NixOS path to the glibc locale archive, to be set in the upstart job */
|
|
+ if (getenv("LOCALE_ARCHIVE"))
|
|
+ child_set_env(&env, &envsize, "LOCALE_ARCHIVE", getenv("LOCALE_ARCHIVE"));
|
|
+
|
|
/* Set custom environment options from RSA authentication. */
|
|
if (!options.use_login) {
|
|
while (custom_environment) {
|