diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-12-03 16:20:57 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-03 16:21:15 +0100 |
commit | 89beb9cf72421960eb51d36e2949c29470adc5ee (patch) | |
tree | dc864eae4933d764e19ef7b435bccdd8c5dc9f0b /pkgs/development/libraries/hwloc/default.nix | |
parent | 158388b5218779e5a779ce323a4639d7f9924796 (diff) | |
download | nixpkgs-89beb9cf72421960eb51d36e2949c29470adc5ee.tar nixpkgs-89beb9cf72421960eb51d36e2949c29470adc5ee.tar.gz nixpkgs-89beb9cf72421960eb51d36e2949c29470adc5ee.tar.bz2 nixpkgs-89beb9cf72421960eb51d36e2949c29470adc5ee.tar.lz nixpkgs-89beb9cf72421960eb51d36e2949c29470adc5ee.tar.xz nixpkgs-89beb9cf72421960eb51d36e2949c29470adc5ee.tar.zst nixpkgs-89beb9cf72421960eb51d36e2949c29470adc5ee.zip |
hwloc: update to 1.6
Diffstat (limited to 'pkgs/development/libraries/hwloc/default.nix')
-rw-r--r-- | pkgs/development/libraries/hwloc/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 4f2bd4f679a..de4270008f3 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -2,11 +2,11 @@ , pciutils, numactl }: stdenv.mkDerivation rec { - name = "hwloc-1.4.2"; + name = "hwloc-1.6"; src = fetchurl { - url = "http://www.open-mpi.org/software/hwloc/v1.4/downloads/${name}.tar.bz2"; - sha256 = "0xamcnbkrf18v1rj4h6ddx6cn4gffx6zgzjaym8c3k5mlpgigfdw"; + url = "http://www.open-mpi.org/software/hwloc/v1.6/downloads/${name}.tar.bz2"; + sha256 = "0y561bryiqp1f5af5lm432dcw93xwp1jw55si7wa6skxnd6ch25w"; }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { # Since `libpci' appears in `hwloc.pc', it must be propagated. stdenv.lib.optional stdenv.isLinux pciutils; + enableParallelBuilding = true; + postInstall = stdenv.lib.optionalString (stdenv.isLinux && numactl != null) '' if [ -d "${numactl}/lib64" ] |