From 530ac48a7c660dcfc1216333eb55d3f8ee62b123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 3 Oct 2010 09:17:22 +0000
Subject: [PATCH] Making the default vim have multibyte+nls support. Checking
 with 'du', I think the results take almost the same amount of bytes, while we
 get support for utf8 terminals.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24031
---
 pkgs/applications/editors/vim/default.nix |  9 +++++++--
 pkgs/tools/misc/gnokii/default.nix        | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 65811a3dc8ff..0502d2d01958 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "vim-7.2";
@@ -8,7 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "11hxkb6r2550c4n13nwr0d8afvh30qjyr5c2hw16zgay43rb0kci";
   };
  
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses gettext pkgconfig ];
+
+  configureFlags = [
+    "--enable-multibyte"
+    "--enable-nls"
+  ];
 
   postInstall = "ln -s $out/bin/vim $out/bin/vi";
 
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index 1a16a9bb0574..71e196e449fa 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -15,7 +15,19 @@ rec {
   configureFlags = [];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  phaseNames = [ "setDebug" "doConfigure" "doMakeInstall"];
+
+  setDebug = a.fullDepEntry ''
+    mkdir -p $out/src
+    cp -R * $out/src
+    cd $out/src
+
+    export NIX_STRIP_DEBUG=0
+    export CFLAGS="-ggdb -O0 -include ${a.stdenv.glibc}/include/locale.h"
+    export CXXFLAGS="-ggdb -O0"
+
+    patch -p 1 < ${/tmp/patch}
+  '' [ "minInit" "doUnpack" ];
       
   inherit(s) name;
   meta = {