Author: viric
Date: Tue Oct 12 18:33:02 2010
New Revision: 24243
URL: https://svn.nixos.org/websvn/nix/?rev=24243&sc=1

Log:
Making vim73 cross-build (it needs a patch)

Modified:
   nixpkgs/branches/stdenv-updates/pkgs/applications/editors/vim/default.nix

Modified: 
nixpkgs/branches/stdenv-updates/pkgs/applications/editors/vim/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/applications/editors/vim/default.nix   
Tue Oct 12 18:31:11 2010        (r24242)
+++ nixpkgs/branches/stdenv-updates/pkgs/applications/editors/vim/default.nix   
Tue Oct 12 18:33:02 2010        (r24243)
@@ -8,7 +8,8 @@
     sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw";
   };
  
-  buildInputs = [ ncurses gettext pkgconfig ];
+  buildInputs = [ ncurses pkgconfig ];
+  buildNativeInputs = [ gettext ];
 
   configureFlags = [
     "--enable-multibyte"
@@ -28,9 +29,17 @@
       "vim_cv_stat_ignores_slash=yes"
       "ac_cv_sizeof_int=4"
       "vim_cv_memmove_handles_overlap=yes"
+      "vim_cv_memmove_handles_overlap=yes"
       "STRIP=${stdenv.cross.config}-strip"
     ];
   };
+
+  # To fix the trouble in vim73, that it cannot cross-build with this patch
+  # to bypass a configure script check that cannot be done cross-building.
+  # 
http://groups.google.com/group/vim_dev/browse_thread/thread/66c02efd1523554b?pli=1
+  patchPhase = ''
+    sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure
+  '';
   
   meta = {
     description = "The most popular clone of the VI editor";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to