From b7af00b889a035738887ad9acedbe877a6146260 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Sun, 9 May 2010 12:44:09 +0000
Subject: 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
---
 pkgs/tools/networking/openssh/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs')

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 ]
-- 
cgit 1.4.1