From d0151a7465187b7bf16d0a6ea4a4cf881d1392a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 6 Dec 2011 14:04:01 +0000
Subject: [PATCH] hwloc 1.3.

svn path=/nixpkgs/trunk/; revision=30771
---
 pkgs/development/libraries/hwloc/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 9bb7562cc21..2b2ec1733a1 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -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;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa3fdd7dd6d..8ba04ed3025 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };