Author: viric
Date: Sat Sep 18 16:29:47 2010
New Revision: 23859
URL: https://svn.nixos.org/websvn/nix/?rev=23859&sc=1
Log:
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.
Modified:
nixpkgs/trunk/pkgs/applications/editors/vim/default.nix
nixpkgs/trunk/pkgs/tools/misc/gnokii/default.nix
Modified: nixpkgs/trunk/pkgs/applications/editors/vim/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/vim/default.nix Sat Sep 18
16:29:07 2010 (r23858)
+++ nixpkgs/trunk/pkgs/applications/editors/vim/default.nix Sat Sep 18
16:29:47 2010 (r23859)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses, gettext, pkgconfig }:
stdenv.mkDerivation rec {
name = "vim-7.2";
@@ -8,7 +8,12 @@
sha256 = "11hxkb6r2550c4n13nwr0d8afvh30qjyr5c2hw16zgay43rb0kci";
};
- buildInputs = [ ncurses ];
+ buildInputs = [ ncurses gettext pkgconfig ];
+
+ configureFlags = [
+ "--enable-multibyte"
+ "--enable-nls"
+ ];
postInstall = "ln -s $out/bin/vim $out/bin/vi";
Modified: nixpkgs/trunk/pkgs/tools/misc/gnokii/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/misc/gnokii/default.nix Sat Sep 18 16:29:07
2010 (r23858)
+++ nixpkgs/trunk/pkgs/tools/misc/gnokii/default.nix Sat Sep 18 16:29:47
2010 (r23859)
@@ -15,7 +15,19 @@
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 = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
