diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-04-19 14:06:07 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-04-19 14:06:07 +0000 |
| commit | 73b7a7fea727ab5ba7110bfd8fc1f9f7dce9b689 (patch) | |
| tree | e0770cd939b38bc5fc9cf5f8b960fa4d5131a6c3 /pkgs/development | |
| parent | f431b2ac38d060da93042dcc85744115463f5a37 (diff) | |
| download | nixlib-73b7a7fea727ab5ba7110bfd8fc1f9f7dce9b689.tar nixlib-73b7a7fea727ab5ba7110bfd8fc1f9f7dce9b689.tar.gz nixlib-73b7a7fea727ab5ba7110bfd8fc1f9f7dce9b689.tar.bz2 nixlib-73b7a7fea727ab5ba7110bfd8fc1f9f7dce9b689.tar.lz nixlib-73b7a7fea727ab5ba7110bfd8fc1f9f7dce9b689.tar.xz nixlib-73b7a7fea727ab5ba7110bfd8fc1f9f7dce9b689.tar.zst nixlib-73b7a7fea727ab5ba7110bfd8fc1f9f7dce9b689.zip | |
hwloc 1.0rc1.
svn path=/nixpkgs/trunk/; revision=21166
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/hwloc/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/development/libraries/hwloc/ncurses.patch | 13 |
2 files changed, 24 insertions, 11 deletions
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 8dede02fb0a1..53c33787da59 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/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; }; } diff --git a/pkgs/development/libraries/hwloc/ncurses.patch b/pkgs/development/libraries/hwloc/ncurses.patch new file mode 100644 index 000000000000..58dffea52651 --- /dev/null +++ b/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]) |