Merge pull request #45015 from jbaum98/linxbox_darwin
linbox: Add darwin support
This commit is contained in:
commit
2eed806ed9
2 changed files with 12 additions and 5 deletions
|
@ -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/;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue