public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

armadillo: Fix failing build

Browse Source 
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.
This commit is contained in:
Josef Kemetmueller 2016-08-15 22:44:55 +02:00
parent d9c368a140
commit 0fbb00e6c3
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/armadillo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5-cpp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "7.200.2"; version = "7.200.2";
@ -9,12 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm"; sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm";
}; };
buildInputs = [ cmake openblasCompat superlu hdf5 ]; buildInputs = [ cmake openblasCompat superlu hdf5-cpp ];
cmakeFlags = [ "-DDETECT_HDF5=ON" ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ];
patches = [ ./use-unix-config-on-OS-X.patch patches = [ ./use-unix-config-on-OS-X.patch ];
./use-OpenBLAS-as-LAPACK.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "C++ linear algebra library"; description = "C++ linear algebra library";

14
pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch
View File

@ -1,14 +0,0 @@
diff --git a/cmake_aux/Modules/ARMA_FindLAPACK.cmake b/cmake_aux/Modules/ARMA_FindLAPACK.cmake
index 5395afb..a203c93 100644
--- a/cmake_aux/Modules/ARMA_FindLAPACK.cmake
+++ b/cmake_aux/Modules/ARMA_FindLAPACK.cmake
@@ -5,7 +5,7 @@
# also defined, but not for general use are
# LAPACK_LIBRARY, where to find the LAPACK library.
-SET(LAPACK_NAMES ${LAPACK_NAMES} lapack)
+SET(LAPACK_NAMES ${LAPACK_NAMES} openblas)
FIND_LIBRARY(LAPACK_LIBRARY
NAMES ${LAPACK_NAMES}
PATHS /usr/lib64/atlas /usr/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib