swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-06 02:06:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45015 from jbaum98/linxbox_darwin

Browse source 
linbox: Add darwin support
This commit is contained in:
Timo Kaufmann 2018-08-19 20:42:02 +02:00 committed by GitHub
parent 63d8458ee0 b99b7c5ef8
commit 2eed806ed9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
, 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/;
};
}

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 {};
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;