diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 53c33787da59..5c3d37729e6d 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,19 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses -, autoconf, automake, libtool }: +{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses }: stdenv.mkDerivation rec { - name = "hwloc-1.0rc1"; + name = "hwloc-1.0"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.0/downloads/${name}.tar.bz2"; - sha256 = "0mgjlyfwp1pbl2312l9diwjw53yb9hb62slmvcb3xvhqdwvj0d7s"; + sha256 = "1s64w026idxrkf0y56q4cybapz7yldn1xycnfh1d5bj7v7ncds21"; }; - patches = [ ./ncurses.patch ]; - - preConfigure = "autoreconf -vfi"; - - buildInputs = [ autoconf automake libtool pkgconfig cairo expat ncurses ]; + buildInputs = [ pkgconfig cairo expat ncurses ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cf7b4f44b0b..61da353a7c7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4193,8 +4193,7 @@ let }; hwloc = import ../development/libraries/hwloc { - inherit fetchurl stdenv pkgconfig cairo expat ncurses - autoconf automake libtool; + inherit fetchurl stdenv pkgconfig cairo expat ncurses; }; hydraAntLogger = import ../development/libraries/java/hydra-ant-logger {