Author: viric
Date: Tue Oct 12 19:39:30 2010
New Revision: 24246
URL: https://svn.nixos.org/websvn/nix/?rev=24246&sc=1
Log:
Cross-building ncursesw was not that easy; it needed this patch, at least for
the current nixpkgs (gcc, glibc)
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ncurses/wint_t.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ncurses/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ncurses/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ncurses/default.nix
Tue Oct 12 19:06:04 2010 (r24245)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ncurses/default.nix
Tue Oct 12 19:39:30 2010 (r24246)
@@ -7,6 +7,10 @@
url = "mirror://gnu/ncurses/${name}.tar.gz";
sha256 = "1x4q6kma6zgg438llbgiac3kik7j2lln9v97jdffv3fyqyjxx6qa";
};
+
+ crossAttrs = {
+ patches = [ ./wint_t.patch ];
+ };
configureFlags = ''
--with-shared --includedir=''${out}/include --without-debug
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ncurses/wint_t.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ncurses/wint_t.patch
Tue Oct 12 19:39:30 2010 (r24246)
@@ -0,0 +1,14 @@
+http://www.mail-archive.com/[email protected]/msg01326.html
+--- ncurses-5.6.orig/ncurses/curses.priv.h 2006-12-10 01:55:14.000000000
0100
++++ ncurses-5.6/ncurses/curses.priv.h 2008-02-11 13:12:04.000000000 +0100
+@@ -253,6 +253,10 @@ color_t;
+ #include <term_entry.h>
+ #include <nc_tparm.h>
+
++#ifndef _WINT_T
++#include <wchar.h>
++#endif
++
+ #if NCURSES_EXT_COLORS && USE_WIDEC_SUPPORT
+ #define if_EXT_COLORS(stmt) stmt
+ #define NetPair(value,p) (value).ext_color = (p), \
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
