diff options
author | Josef Kemetmüller <josef.kemetmueller@aon.at> | 2016-08-16 08:29:15 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-08-16 06:29:15 +0000 |
commit | 24ab0460a9cf63a91aa3681e6f6557c05b48bf33 (patch) | |
tree | f4201353a2e7fa4e9862705bd632877de5e87b86 /pkgs/development/libraries/armadillo/default.nix | |
parent | 1759825b34cad43f8925aa015c80f56a57eb12e6 (diff) | |
download | nixlib-24ab0460a9cf63a91aa3681e6f6557c05b48bf33.tar nixlib-24ab0460a9cf63a91aa3681e6f6557c05b48bf33.tar.gz nixlib-24ab0460a9cf63a91aa3681e6f6557c05b48bf33.tar.bz2 nixlib-24ab0460a9cf63a91aa3681e6f6557c05b48bf33.tar.lz nixlib-24ab0460a9cf63a91aa3681e6f6557c05b48bf33.tar.xz nixlib-24ab0460a9cf63a91aa3681e6f6557c05b48bf33.tar.zst nixlib-24ab0460a9cf63a91aa3681e6f6557c05b48bf33.zip |
armadillo: Fix failing build (#17764)
The upgrade of cmake to v3.6.0 broke this build. HDF5 now can only be found if hdf5-cpp is used as buildInput. However the upgrade made it possible to remove a patch: CMake can now find openblas on its own.
Diffstat (limited to 'pkgs/development/libraries/armadillo/default.nix')
-rw-r--r-- | pkgs/development/libraries/armadillo/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 937275b6528a..62b5ddf8011a 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: +{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5-cpp }: stdenv.mkDerivation rec { version = "7.200.2"; @@ -9,12 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm"; }; - buildInputs = [ cmake openblasCompat superlu hdf5 ]; + buildInputs = [ cmake openblasCompat superlu hdf5-cpp ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ]; - patches = [ ./use-unix-config-on-OS-X.patch - ./use-OpenBLAS-as-LAPACK.patch ]; + patches = [ ./use-unix-config-on-OS-X.patch ]; meta = with stdenv.lib; { description = "C++ linear algebra library"; |