utf-8 was not working in cross-built ncurses programs due to some old problem
cross-building ncursesw not present anymore. I reenable unicode cross-building. svn path=/nixpkgs/branches/stdenv-updates/; revision=24245
This commit is contained in:
parent
46201622cb
commit
57df19fe85
@ -17,11 +17,6 @@ stdenv.mkDerivation {
|
|||||||
buildInputs = [ ncurses ] ++ stdenv.lib.optional sslSupport openssl;
|
buildInputs = [ ncurses ] ++ stdenv.lib.optional sslSupport openssl;
|
||||||
buildNativeInputs = [ ncurses ];
|
buildNativeInputs = [ ncurses ];
|
||||||
|
|
||||||
crossAttrs = {
|
|
||||||
configureFlags = "--enable-widec" +
|
|
||||||
(if sslSupport then " --with-ssl" else "");
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://lynx.isc.org/;
|
homepage = http://lynx.isc.org/;
|
||||||
description = "A text-mode web browser";
|
description = "A text-mode web browser";
|
||||||
|
@ -3590,9 +3590,7 @@ let
|
|||||||
|
|
||||||
ncurses = makeOverridable (import ../development/libraries/ncurses) {
|
ncurses = makeOverridable (import ../development/libraries/ncurses) {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
# The "! (stdenv ? cross)" is for the cross-built arm ncurses, which
|
unicode = system != "i686-cygwin";
|
||||||
# don't build for me in unicode.
|
|
||||||
unicode = (system != "i686-cygwin" && crossSystem == null);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
neon = neon029;
|
neon = neon029;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user