diff options
author | Jake Waksbaum <jake.waksbaum@gmail.com> | 2018-08-18 20:54:22 +0000 |
---|---|---|
committer | Jake Waksbaum <jake.waksbaum@gmail.com> | 2018-08-19 13:55:48 -0400 |
commit | b99b7c5ef85f62ca2941c4cd77af9c5594684866 (patch) | |
tree | 72b9c645f77a407954e6ccfb9aa8d3fddf7bb1f5 | |
parent | 8014c7f186afb66ae746d6b1af9ce4510fb55eae (diff) | |
download | nixpkgs-b99b7c5ef85f62ca2941c4cd77af9c5594684866.tar nixpkgs-b99b7c5ef85f62ca2941c4cd77af9c5594684866.tar.gz nixpkgs-b99b7c5ef85f62ca2941c4cd77af9c5594684866.tar.bz2 nixpkgs-b99b7c5ef85f62ca2941c4cd77af9c5594684866.tar.lz nixpkgs-b99b7c5ef85f62ca2941c4cd77af9c5594684866.tar.xz nixpkgs-b99b7c5ef85f62ca2941c4cd77af9c5594684866.tar.zst nixpkgs-b99b7c5ef85f62ca2941c4cd77af9c5594684866.zip |
linbox: Add darwin support
-rw-r--r-- | pkgs/development/libraries/linbox/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index c4ff0e892a8..a9a649e2de7 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , givaro , pkgconfig -, openblas +, blas , fflas-ffpack , gmpxx , optimize ? false # impure @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { buildInputs = [ givaro - openblas + blas gmpxx fflas-ffpack ]; configureFlags = [ - "--with-blas-libs=-lopenblas" + "--with-blas-libs=-l${blas.linkName}" "--disable-optimization" ] ++ stdenv.lib.optionals (!optimize) [ # disable SIMD instructions (which are enabled *when available* by default) @@ -65,12 +65,14 @@ stdenv.mkDerivation rec { doCheck = true; + enableParallelBuilding = true; + meta = { inherit version; description = "C++ library for exact, high-performance linear algebra"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.timokau]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://linalg.org/; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d65691ba2b7..4030896f19c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9202,7 +9202,12 @@ with pkgs; }; fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {}; - linbox = callPackage ../development/libraries/linbox {}; + linbox = callPackage ../development/libraries/linbox { + # We need to use blas instead of openblas on darwin, see + # https://github.com/NixOS/nixpkgs/pull/45013 and + # https://github.com/NixOS/nixpkgs/pull/45015. + blas = if stdenv.isDarwin then blas else openblas; + }; ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; |