diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-03-31 10:47:18 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-17 16:24:09 -0500 |
| commit | 1c8aba83340be3713f68410d1d273a8b15e7e007 (patch) | |
| tree | fdc752744f384be57b6ff3c65495018432bff0ab /pkgs/applications/science/math/R/default.nix | |
| parent | 43873351ffed36b52170571839e26b57c9f15920 (diff) | |
treewide: use blas and lapack
This makes packages use lapack and blas, which can wrap different BLAS/LAPACK implementations. treewide: cleanup from blas/lapack changes A few issues in the original treewide: - can’t assume blas64 is a bool - unused commented code
Diffstat (limited to 'pkgs/applications/science/math/R/default.nix')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 3ee62fad44da2..836ce004fff22 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib -, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas +, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false @@ -9,6 +9,8 @@ , static ? false }: +assert (!blas.is64bit) && (!lapack.is64bit); + stdenv.mkDerivation rec { name = "R-3.6.3"; @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre perl readline texLive xz zlib less texinfo graphviz icu - pkgconfig bison imake which openblas curl tcl tk jdk + pkgconfig bison imake which blas lapack curl tcl tk jdk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ @@ -43,8 +45,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( --disable-lto --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages - --with-blas="-L${openblas}/lib -lopenblas" - --with-lapack="-L${openblas}/lib -lopenblas" + --with-blas="-L${blas}/lib -lblas" + --with-lapack="-L${lapack}/lib -llapack" --with-readline --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-cairo |