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

linbox: Add darwin support

Browse Source
This commit is contained in:
Jake Waksbaum 2018-08-18 20:54:22 +00:00
parent 8014c7f186
commit b99b7c5ef8
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/linbox/default.nix
View File

@ -4,7 +4,7 @@
, autoreconfHook , autoreconfHook
, givaro , givaro
, pkgconfig , pkgconfig
, openblas , blas
, fflas-ffpack , fflas-ffpack
, gmpxx , gmpxx
, optimize ? false # impure , optimize ? false # impure
@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
givaro givaro
openblas blas
gmpxx gmpxx
fflas-ffpack fflas-ffpack
]; ];
configureFlags = [ configureFlags = [
"--with-blas-libs=-lopenblas" "--with-blas-libs=-l${blas.linkName}"
"--disable-optimization" "--disable-optimization"
] ++ stdenv.lib.optionals (!optimize) [ ] ++ stdenv.lib.optionals (!optimize) [
# disable SIMD instructions (which are enabled *when available* by default) # disable SIMD instructions (which are enabled *when available* by default)
@ -65,12 +65,14 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
enableParallelBuilding = true;
meta = { meta = {
inherit version; inherit version;
description = "C++ library for exact, high-performance linear algebra"; description = "C++ library for exact, high-performance linear algebra";
license = stdenv.lib.licenses.lgpl21Plus; license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.timokau]; maintainers = [stdenv.lib.maintainers.timokau];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
homepage = http://linalg.org/; homepage = http://linalg.org/;
}; };
} }

7
pkgs/top-level/all-packages.nix
View File

@ -9202,7 +9202,12 @@ with pkgs;
}; };
fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {}; 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 { ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;