summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-05-09 12:44:09 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-05-09 12:44:09 +0000
commitb7af00b889a035738887ad9acedbe877a6146260 (patch)
treefc2b681bf71a3bf9a7a994d8c0f84d0595ad3e0f /pkgs/tools/networking
parent9012b226c7eae0f624bc0cfa7b519067f01d2011 (diff)
downloadnixlib-b7af00b889a035738887ad9acedbe877a6146260.tar
nixlib-b7af00b889a035738887ad9acedbe877a6146260.tar.gz
nixlib-b7af00b889a035738887ad9acedbe877a6146260.tar.bz2
nixlib-b7af00b889a035738887ad9acedbe877a6146260.tar.lz
nixlib-b7af00b889a035738887ad9acedbe877a6146260.tar.xz
nixlib-b7af00b889a035738887ad9acedbe877a6146260.tar.zst
nixlib-b7af00b889a035738887ad9acedbe877a6146260.zip
Making openssh pass the LOCALE_ARCHIVE variable to the forked session processes,
so the session 'bash' will receive the proper locale archive, and thus process
UTF-8 properly.

svn path=/nixpkgs/trunk/; revision=21678
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/openssh/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index cd3074546f42..67ece3c907f4 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -23,10 +23,11 @@ stdenv.mkDerivation rec {
     sha256 = "12kywhjnz6w6kx5fk526fhs2xc7rf234hwrms9p1hqv6zrpdvvin";
   };
 
-  patchPhase = stdenv.lib.optionalString hpnSupport
+  prePatch = stdenv.lib.optionalString hpnSupport
     ''
       gunzip -c ${hpnSrc} | patch -p1
     '';
+  patches = [ ./locale_archive.patch ];
   
   buildInputs =
     [ zlib openssl perl libedit pkgconfig ]