Author: ludo
Date: Mon Jan 17 09:16:30 2011
New Revision: 25594
URL: https://svn.nixos.org/websvn/nix/?rev=25594&sc=1
Log:
GNU Ncurses: Attempt to fix Solaris builds.
Modified:
nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nix Sun Jan
16 22:45:05 2011 (r25593)
+++ nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nix Mon Jan
17 09:16:30 2011 (r25594)
@@ -1,20 +1,30 @@
{stdenv, fetchurl, unicode ? true}:
-stdenv.mkDerivation ( rec {
+let
+ /* C++ bindings fail to build on `i386-pc-solaris2.11' with GCC 3.4.3:
+ <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6395191>.
+ It seems that it could be worked around by #including <wchar.h> in the
+ right place, according to
+
<http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>,
+ but this is left as an exercise to the reader.
+ So disable them for now. */
+ cxx = stdenv.system != "i386-sunos";
+in
+stdenv.mkDerivation (rec {
name = "ncurses-5.7";
-
+
src = fetchurl {
url = "mirror://gnu/ncurses/${name}.tar.gz";
sha256 = "1x4q6kma6zgg438llbgiac3kik7j2lln9v97jdffv3fyqyjxx6qa";
};
- crossAttrs = {
+ crossAttrs = {
patches = [ ./wint_t.patch ];
};
-
+
configureFlags = ''
--with-shared --includedir=''${out}/include --without-debug
- ${if unicode then "--enable-widec" else ""}
+ ${if unicode then "--enable-widec" else ""}${if cxx then "" else
"--without-cxx-binding"}
'';
selfBuildNativeInput = true;
@@ -58,5 +68,8 @@
homepage = http://www.gnu.org/software/ncurses/;
license = "X11";
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.all;
};
} // ( if stdenv.isDarwin then { postFixup = "rm $out/lib/*.so"; } else { } ) )
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
