Author: ludo
Date: Tue Dec 6 14:04:01 2011
New Revision: 30771
URL: https://nixos.org/websvn/nix/?rev=30771&sc=1
Log:
hwloc 1.3.
Modified:
nixpkgs/trunk/pkgs/development/libraries/hwloc/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/hwloc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/hwloc/default.nix Tue Dec 6
07:00:04 2011 (r30770)
+++ nixpkgs/trunk/pkgs/development/libraries/hwloc/default.nix Tue Dec 6
14:04:01 2011 (r30771)
@@ -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;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Dec 6 07:00:04
2011 (r30770)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Dec 6 14:04:01
2011 (r30771)
@@ -3703,7 +3703,9 @@
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
{ };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
