diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-09 12:53:46 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-09 12:53:46 +0000 |
| commit | 8b311ba7573b64c0c941d3a287c19f3d0cb4fc89 (patch) | |
| tree | b576b77f0f1dba5bd9b78b3703aa3b6b28a5cd19 /pkgs/tools/networking/openssh | |
| parent | 8edf4f1896e53a40c3c00598943d665e677c5198 (diff) | |
| download | nixlib-8b311ba7573b64c0c941d3a287c19f3d0cb4fc89.tar nixlib-8b311ba7573b64c0c941d3a287c19f3d0cb4fc89.tar.gz nixlib-8b311ba7573b64c0c941d3a287c19f3d0cb4fc89.tar.bz2 nixlib-8b311ba7573b64c0c941d3a287c19f3d0cb4fc89.tar.lz nixlib-8b311ba7573b64c0c941d3a287c19f3d0cb4fc89.tar.xz nixlib-8b311ba7573b64c0c941d3a287c19f3d0cb4fc89.tar.zst nixlib-8b311ba7573b64c0c941d3a287c19f3d0cb4fc89.zip | |
Adding the openssh patch I forgot in a recent commit
svn path=/nixpkgs/trunk/; revision=21681
Diffstat (limited to 'pkgs/tools/networking/openssh')
| -rw-r--r-- | pkgs/tools/networking/openssh/locale_archive.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/tools/networking/openssh/locale_archive.patch b/pkgs/tools/networking/openssh/locale_archive.patch new file mode 100644 index 000000000000..a7f946d693a2 --- /dev/null +++ b/pkgs/tools/networking/openssh/locale_archive.patch @@ -0,0 +1,15 @@ +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) { |