Author: viric
Date: Tue Oct 12 19:06:04 2010
New Revision: 24245
URL: https://svn.nixos.org/websvn/nix/?rev=24245&sc=1
Log:
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.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/lynx/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/lynx/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/lynx/default.nix
Tue Oct 12 18:42:38 2010 (r24244)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/lynx/default.nix
Tue Oct 12 19:06:04 2010 (r24245)
@@ -17,11 +17,6 @@
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";
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Oct
12 18:42:38 2010 (r24244)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Oct
12 19:06:04 2010 (r24245)
@@ -3590,9 +3590,7 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
