hwloc 1.0rc1.

svn path=/nixpkgs/trunk/; revision=21166

pkgs/development/libraries/hwloc/default.nix

@@ -1,14 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, cairo, expat }:
+{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses
+, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "hwloc-0.9.2";
+  name = "hwloc-1.0rc1";
 
   src = fetchurl {
-    url = "http://www.open-mpi.org/software/hwloc/v0.9/downloads/${name}.tar.bz2";
-    sha256 = "1smxvz2g05kci1ra78iqmgk02rym3qwh1mrm68rxv70fhqhvq741";
+    url = "http://www.open-mpi.org/software/hwloc/v1.0/downloads/${name}.tar.bz2";
+    sha256 = "0mgjlyfwp1pbl2312l9diwjw53yb9hb62slmvcb3xvhqdwvj0d7s";
   };
 
-  buildInputs = [ pkgconfig cairo expat ];
+  patches = [ ./ncurses.patch ];
+
+  preConfigure = "autoreconf -vfi";
+
+  buildInputs = [ autoconf automake libtool pkgconfig cairo expat ncurses ];
 
   doCheck = true;
 
@@ -37,11 +42,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.open-mpi.org/projects/hwloc/;
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
-
-    # It doesn't support the BSDs.
-    platforms = stdenv.lib.platforms.linux
-             ++ stdenv.lib.platforms.darwin
-             ++ stdenv.lib.platforms.cygwin
-             /* ++ opensolaris */;
+    platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/development/libraries/hwloc/ncurses.patch

@@ -0,0 +1,13 @@
+Help `configure' find `tparm' in libncurses.
+
+--- a/config/hwloc.m4	2010-04-19 14:25:53.000000000 +0200
++++ b/config/hwloc.m4	2010-04-19 14:24:23.000000000 +0200
+@@ -285,7 +285,7 @@ EOF])
+     LIBS=
+     AC_CHECK_HEADERS([curses.h], [
+       AC_CHECK_HEADERS([term.h], [
+-        AC_SEARCH_LIBS([tparm], [termcap curses], [
++        AC_SEARCH_LIBS([tparm], [ncurses termcap curses], [
+             AC_SUBST([HWLOC_TERMCAP_LIBS], ["$LIBS"])
+             AC_DEFINE([HWLOC_HAVE_LIBTERMCAP], [1],
+                       [Define to 1 if you have a library providing the termcap interface])

pkgs/top-level/all-packages.nix

@@ -4025,7 +4025,8 @@ let
   };
 
   hwloc = import ../development/libraries/hwloc {
-    inherit fetchurl stdenv pkgconfig cairo expat;
+    inherit fetchurl stdenv pkgconfig cairo expat ncurses
+      autoconf automake libtool;
   };
 
   hydraAntLogger = import ../development/libraries/java/hydra-ant-logger {