hwloc 1.3.

svn path=/nixpkgs/trunk/; revision=30771
This commit is contained in:
Ludovic Courtès 2011-12-06 14:04:01 +00:00
parent 93511ab4f1
commit d0151a7465
2 changed files with 8 additions and 5 deletions

View File

@ -1,14 +1,15 @@
{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses }:
{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 }:
stdenv.mkDerivation rec {
name = "hwloc-1.2";
name = "hwloc-1.3";
src = fetchurl {
url = "http://www.open-mpi.org/software/hwloc/v1.2/downloads/${name}.tar.bz2";
sha256 = "04mrlmcp596imzbhlflb53ddld705k9617rzpprnhp3643krn0dw";
sha256 = "10zlz0hng7scjx1xn8jflx3gbga5djbhxhj94k5kszrivc8zh8xy";
};
buildInputs = [ pkgconfig cairo expat ncurses ];
# XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
buildInputs = [ pkgconfig cairo expat ncurses libX11 ];
doCheck = true;

View File

@ -3703,7 +3703,9 @@ let
hunspell = callPackage ../development/libraries/hunspell { };
hwloc = callPackage ../development/libraries/hwloc { };
hwloc = callPackage ../development/libraries/hwloc {
inherit (xlibs) libX11;
};
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };