From 57df19fe857552c16e472068a44081b8b26b5d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 12 Oct 2010 19:06:04 +0000 Subject: [PATCH] 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 --- pkgs/applications/networking/browsers/lynx/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index ed13fb550e5..97d28dd7e2f 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -17,11 +17,6 @@ stdenv.mkDerivation { buildInputs = [ ncurses ] ++ stdenv.lib.optional sslSupport openssl; buildNativeInputs = [ ncurses ]; - crossAttrs = { - configureFlags = "--enable-widec" + - (if sslSupport then " --with-ssl" else ""); - }; - meta = { homepage = http://lynx.isc.org/; description = "A text-mode web browser"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08067f0197c..acc81541c56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3590,9 +3590,7 @@ let ncurses = makeOverridable (import ../development/libraries/ncurses) { inherit fetchurl stdenv; - # The "! (stdenv ? cross)" is for the cross-built arm ncurses, which - # don't build for me in unicode. - unicode = (system != "i686-cygwin" && crossSystem == null); + unicode = system != "i686-cygwin"; }; neon = neon029;