diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-12-14 08:51:48 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-12-14 16:03:09 +0100 |
commit | e520a8cc0d0a504ddc36fa04d6a00dd36639f56d (patch) | |
tree | df0e642b86a9b330dae6b9ecb611de72d4c9e006 /pkgs/development/libraries/hwloc/default.nix | |
parent | f429d40f4a3fde7b16ec24066eb4535cd2562f65 (diff) | |
download | nixpkgs-e520a8cc0d0a504ddc36fa04d6a00dd36639f56d.tar nixpkgs-e520a8cc0d0a504ddc36fa04d6a00dd36639f56d.tar.gz nixpkgs-e520a8cc0d0a504ddc36fa04d6a00dd36639f56d.tar.bz2 nixpkgs-e520a8cc0d0a504ddc36fa04d6a00dd36639f56d.tar.lz nixpkgs-e520a8cc0d0a504ddc36fa04d6a00dd36639f56d.tar.xz nixpkgs-e520a8cc0d0a504ddc36fa04d6a00dd36639f56d.tar.zst nixpkgs-e520a8cc0d0a504ddc36fa04d6a00dd36639f56d.zip |
hwloc: 1.11.6 -> 1.11.8
Also introduces multiple outputs and a version without X11 dependencies.
Diffstat (limited to 'pkgs/development/libraries/hwloc/default.nix')
-rw-r--r-- | pkgs/development/libraries/hwloc/default.nix | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index e1acacc328c..4d6af866990 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 -, pciutils, numactl }: +{ stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl +, cairo, libX11 +, x11Support ? (!stdenv.isCygwin) +}: with stdenv.lib; stdenv.mkDerivation rec { - name = "hwloc-1.11.6"; + name = "hwloc-1.11.8"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; - sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn"; + sha256 = "0karxv4r1r8sa7ki5aamlxdvyvz0bvzq4gdhq0yi5nc4a0k11vzc"; }; + hardeningDisable = [ "format" ]; + + configureFlags = [ + "--localstatedir=/var" + ]; + # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. nativeBuildInputs = [ pkgconfig ]; @@ -18,7 +26,7 @@ stdenv.mkDerivation rec { # derivation and set optional dependencies to `null'. buildInputs = stdenv.lib.filter (x: x != null) ([ expat ncurses ] - ++ (optionals (!stdenv.isCygwin) [ cairo libX11 ]) + ++ (optionals x11Support [ cairo libX11 ]) ++ (optionals stdenv.isLinux [ numactl ])); propagatedBuildInputs = @@ -37,7 +45,7 @@ stdenv.mkDerivation rec { test -d "$numalibdir" fi - sed -i "$out/lib/libhwloc.la" \ + sed -i "$lib/lib/libhwloc.la" \ -e "s|-lnuma|-L$numalibdir -lnuma|g" ''; @@ -45,6 +53,8 @@ stdenv.mkDerivation rec { # fail on some build machines. doCheck = false; + outputs = [ "out" "lib" "dev" "doc" "man" ]; + meta = { description = "Portable abstraction of hierarchical architectures for high-performance computing"; longDescription = '' |