hwloc 1.0.

svn path=/nixpkgs/trunk/; revision=21902
This commit is contained in:
Ludovic Courtès 2010-05-19 21:30:37 +00:00
parent ee7ad85926
commit fc763b15eb
2 changed files with 5 additions and 11 deletions

View File

@ -1,19 +1,14 @@
{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses { stdenv, fetchurl, pkgconfig, cairo, expat, ncurses }:
, autoconf, automake, libtool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hwloc-1.0rc1"; name = "hwloc-1.0";
src = fetchurl { src = fetchurl {
url = "http://www.open-mpi.org/software/hwloc/v1.0/downloads/${name}.tar.bz2"; url = "http://www.open-mpi.org/software/hwloc/v1.0/downloads/${name}.tar.bz2";
sha256 = "0mgjlyfwp1pbl2312l9diwjw53yb9hb62slmvcb3xvhqdwvj0d7s"; sha256 = "1s64w026idxrkf0y56q4cybapz7yldn1xycnfh1d5bj7v7ncds21";
}; };
patches = [ ./ncurses.patch ]; buildInputs = [ pkgconfig cairo expat ncurses ];
preConfigure = "autoreconf -vfi";
buildInputs = [ autoconf automake libtool pkgconfig cairo expat ncurses ];
doCheck = true; doCheck = true;

View File

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