about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-07-21 14:02:50 +0100
committerGitHub <noreply@github.com>2017-07-21 14:02:50 +0100
commit3954cbb4a5243d5124660b9f29ea01f7f7bf4991 (patch)
treeedad0b82824494fac8b84f30ad32a0e5786753ef /pkgs
parenta32e501bfbf9f112ddf161497cfdcc52656a76d1 (diff)
parent6f72708c126dbdad4edc0dec2d4e77bc20e743d3 (diff)
downloadnixlib-3954cbb4a5243d5124660b9f29ea01f7f7bf4991.tar
nixlib-3954cbb4a5243d5124660b9f29ea01f7f7bf4991.tar.gz
nixlib-3954cbb4a5243d5124660b9f29ea01f7f7bf4991.tar.bz2
nixlib-3954cbb4a5243d5124660b9f29ea01f7f7bf4991.tar.lz
nixlib-3954cbb4a5243d5124660b9f29ea01f7f7bf4991.tar.xz
nixlib-3954cbb4a5243d5124660b9f29ea01f7f7bf4991.tar.zst
nixlib-3954cbb4a5243d5124660b9f29ea01f7f7bf4991.zip
Merge pull request #27528 from knedlsepp/fix-armadillo-lapack
armadillo: Make use of openBLAS's built-in LAPACK
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/armadillo/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index d5a601f09ba0..514c73f5e0fc 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -12,9 +12,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openblasCompat superlu hdf5 ];
 
-  cmakeFlags = [ "-DDETECT_HDF5=ON" ];
+  cmakeFlags = let
+    libSuff = if stdenv.isDarwin then "dylib" else "so";
+  in [
+    "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas.${libSuff}"
+    "-DDETECT_HDF5=ON"
+  ];
 
- patches = [ ./use-unix-config-on-OS-X.patch ];
+  patches = [ ./use-unix-config-on-OS-X.patch ];
 
   meta = with stdenv.lib; {
     description = "C++ linear algebra library";