diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-23 12:04:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-23 12:04:54 -0500 |
commit | d6b1e816ebb8ffa4ef377bb565480eefb496509c (patch) | |
tree | 806ad10f2ddc8b63b3317268d24bdac5c59e8071 /pkgs/development | |
parent | cf6fdcabacd68cd569da1c10c6acce9cbb343ca9 (diff) | |
parent | c93579d0fa772c95c0298d4d838ef53bdd07982d (diff) | |
download | nixlib-d6b1e816ebb8ffa4ef377bb565480eefb496509c.tar nixlib-d6b1e816ebb8ffa4ef377bb565480eefb496509c.tar.gz nixlib-d6b1e816ebb8ffa4ef377bb565480eefb496509c.tar.bz2 nixlib-d6b1e816ebb8ffa4ef377bb565480eefb496509c.tar.lz nixlib-d6b1e816ebb8ffa4ef377bb565480eefb496509c.tar.xz nixlib-d6b1e816ebb8ffa4ef377bb565480eefb496509c.tar.zst nixlib-d6b1e816ebb8ffa4ef377bb565480eefb496509c.zip |
Merge pull request #36437 from timokau/origin/fflas-ffpack-update
fflas-ffpack: 2.2.2 -> 2.3.2
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/fflas-ffpack/default.nix | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index edea352ae2dd..82ece22b7c7d 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack}: +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack +, gmpxx +, optimize ? false # impure +}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fflas-ffpack"; @@ -9,9 +12,31 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + checkInputs = [ + gmpxx + ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; - configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack"; + configureFlags = [ + "--with-blas-libs=-lopenblas" + "--with-lapack-libs=-llapack" + ] ++ stdenv.lib.optionals (!optimize) [ + # disable SIMD instructions (which are enabled *when available* by default) + "--disable-sse" + "--disable-sse2" + "--disable-sse3" + "--disable-ssse3" + "--disable-sse41" + "--disable-sse42" + "--disable-avx" + "--disable-avx2" + "--disable-fma" + "--disable-fma4" + ]; + doCheck = true; meta = { inherit version; description = ''Finite Field Linear Algebra Subroutines''; |